[Checkins] SVN: ZODB/branches/jim-thready/src/ZEO/ClientStorage.py Fix delete handling.

Jim Fulton jim at zope.com
Sun Jan 24 14:02:35 EST 2010


Log message for revision 108446:
  Fix delete handling.
  

Changed:
  U   ZODB/branches/jim-thready/src/ZEO/ClientStorage.py

-=-
Modified: ZODB/branches/jim-thready/src/ZEO/ClientStorage.py
===================================================================
--- ZODB/branches/jim-thready/src/ZEO/ClientStorage.py	2010-01-24 19:02:32 UTC (rev 108445)
+++ ZODB/branches/jim-thready/src/ZEO/ClientStorage.py	2010-01-24 19:02:35 UTC (rev 108446)
@@ -1202,12 +1202,15 @@
             self._cache.invalidate(oid, tid, False)
 
         for oid, data in self._tbuf:
-            s = self._seriald[oid] # assigning here asserts that oid in seriald
             # If data is None, we just invalidate.
             if data is not None:
+                s = self._seriald[oid]
                 if s != ResolvedSerial:
                     assert s == tid, (s, tid)
                     self._cache.store(oid, s, None, data)
+            else:
+                # object deletion
+                self._cache.invalidate(oid, tid, False)
 
         if self.fshelper is not None:
             blobs = self._tbuf.blobs



More information about the checkins mailing list