Fixed, _load_oid wasn't cleared if loadBefore returned None.

zopefoundation · Jun 6, 2016 · 14adf5a · 14adf5a
1 parent e514164
commit 14adf5a
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/src/ZEO/ClientStorage.py b/src/ZEO/ClientStorage.py
@@ -845,12 +845,11 @@ def loadBefore(self, oid, tid):
 
             result = self._server.loadBefore(oid, tid)
 
-            if result:
-                with self._lock:    # for atomic processing of invalidations
-                    if self._load_status:
-                        data, tid, end = result
-                        self._cache.store(oid, tid, end, data)
-                    self._load_oid = None
+            with self._lock:    # for atomic processing of invalidations
+                if result and self._load_status:
+                    data, tid, end = result
+                    self._cache.store(oid, tid, end, data)
+                self._load_oid = None
 
         return result