[Zope-Checkins] CVS: ZODB3/ZEO - StorageServer.py:1.98.4.4

Jeremy Hylton jeremy at zope.com
Tue Sep 23 15:03:31 EDT 2003


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

Modified Files:
      Tag: Zope-2_7-branch
	StorageServer.py 
Log Message:
Remove unreachable, buggy code.
Add assertion about behavior of end().


=== ZODB3/ZEO/StorageServer.py 1.98.4.3 => 1.98.4.4 ===
--- ZODB3/ZEO/StorageServer.py:1.98.4.3	Fri Sep 19 15:18:59 2003
+++ ZODB3/ZEO/StorageServer.py	Tue Sep 23 15:03:31 2003
@@ -931,6 +931,7 @@
         self._cond.acquire()
         try:
             assert self._client is not None
+            assert self._client is client
             self._client = None
             self._deadline = None
         finally:
@@ -956,7 +957,6 @@
                 self._trigger.pull_trigger(lambda: client.connection.close())
             else:
                 time.sleep(howlong)
-        self.trigger.close()
 
 def run_in_thread(method, *args):
     t = SlowMethodThread(method, args)




More information about the Zope-Checkins mailing list