[Zodb-checkins] CVS: ZODB3/ZEO - ClientStorage.py:1.73.2.7.2.2

[Jeremy Hylton]

Update of /cvs-repository/ZODB3/ZEO
In directory cvs.zope.org:/tmp/cvs-serv30994/ZEO

Modified Files:
      Tag: ZODB3-fast-restart-branch
	ClientStorage.py 
Log Message:
Set _last_inval_tid from tpc_finish() return value.





=== ZODB3/ZEO/ClientStorage.py 1.73.2.7.2.1 => 1.73.2.7.2.2 ===
--- ZODB3/ZEO/ClientStorage.py:1.73.2.7.2.1	Tue Dec 17 13:07:59 2002
+++ ZODB3/ZEO/ClientStorage.py	Tue Dec 17 13:32:37 2002
@@ -398,7 +398,10 @@
         # That whole exchange is rather unnecessary.
         if self._last_inval_tid is not None:
             if server.lastTransaction() == self._last_inval_tid:
+                log2(INFO, "No verification necessary "
+                     "(_last_inval_tid up-to-date)")
                 return # No need to verify the cache
+        log2(INFO, "Verifying cache")
         server.beginZeoVerify()
         self._cache.verify(server.zeoVerify)
         server.endZeoVerify()
@@ -679,13 +682,13 @@
             if f is not None:
                 f()
 
-            self._server.tpc_finish(self._serial)
+            tid = self._server.tpc_finish(self._serial)
 
             r = self._check_serials()
             assert r is None or len(r) == 0, "unhandled serialnos: %s" % r
 
             self._update_cache()
-            self._last_inval_tid = self._serial
+            self._last_inval_tid = tid
         finally:
             self.end_transaction()