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

[Jeremy Hylton]

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

Modified Files:
	StorageServer.py 
Log Message:
In close_server(), fix reference to timeouts.
Close the trigger when the server exits.



=== ZODB3/ZEO/StorageServer.py 1.86 => 1.87 ===
--- ZODB3/ZEO/StorageServer.py:1.86	Tue Jan  7 17:12:57 2003
+++ ZODB3/ZEO/StorageServer.py	Thu Jan  9 13:18:54 2003
@@ -235,7 +235,8 @@
 
         This is only called from the test suite, AFAICT.
         """
-        self.timeout.stop()
+        for timeout in self.timeouts.values():
+            timeout.stop()
         self.dispatcher.close()
         for storage in self.storages.values():
             storage.close()
@@ -782,13 +783,17 @@
             self._active.wait()
             self._lock.acquire()
             try:
-                howlong = self._deadline - time.time()
+                deadline = self._deadline
+                if deadline is None:
+                    continue
+                howlong = deadline - time.time()
             finally:
                 self._lock.release()
             if howlong <= 0:
                 self.timeout()
             else:
                 time.sleep(howlong)
+        self.trigger.close()
 
     def timeout(self):
         self._lock.acquire()