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

Jeremy Hylton jeremy@zope.com
Wed, 9 Apr 2003 18:31:52 -0400


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

Modified Files:
	ClientStorage.py 
Log Message:
Don't continue with notifyConnected() if the storage is closed.

There's a race between closing the storage and shutting down the
ConnectThread.  If we return here, the ConnectThread does no harm.


=== ZODB3/ZEO/ClientStorage.py 1.90 => 1.91 ===
--- ZODB3/ZEO/ClientStorage.py:1.90	Wed Apr  9 17:26:52 2003
+++ ZODB3/ZEO/ClientStorage.py	Wed Apr  9 18:31:51 2003
@@ -387,6 +387,11 @@
         This is called by ConnectionManager after it has decided which
         connection should be used.
         """
+        if self._cache is None:
+            # the storage was closed, but the connect thread called
+            # this method before it was stopped.
+            return
+
         # XXX would like to report whether we get a read-only connection
         if self._connection is not None:
             reconnect = 1