From d317027746a1c786e94a15a734e4e5a8d4edb7c8 Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Tue, 21 Apr 2015 17:47:19 +0000
Subject: [PATCH] make object cache return item on get, rather than tuple
---
src/python/dm/common/utility/objectCache.py | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/src/python/dm/common/utility/objectCache.py b/src/python/dm/common/utility/objectCache.py
index 7a519510..93ff0ea0 100755
--- a/src/python/dm/common/utility/objectCache.py
+++ b/src/python/dm/common/utility/objectCache.py
@@ -81,7 +81,17 @@ class ObjectCache:
self.lock.release()
def get(self, id):
- return self.objectMap.get(id)
+ item = None
+ itemTuple = self.objectMap.get(id)
+ if itemTuple is not None:
+ id, item, updateTime, expirationTime = itemTuple
+ return item
+
+ def getItemTuple(self, id):
+ itemTuple = self.objectMap.get(id)
+ if itemTuple is None:
+ itemTuple = (id, None, None, None)
+ return itemTuple
def remove(self, id):
self.lock.acquire()
--
GitLab