[Zodb-checkins] CVS: ZODB3/ZEO - StorageServer.py:1.74.2.3.2.3

[Guido van Rossum]

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

Modified Files:
      Tag: ZODB3-deadlock-debug-branch
	StorageServer.py 
Log Message:
Fix for SF tracker item 634121: restart_other() was referencing an
undefined _conn attribute on zeo_storage.  The fix renames this
attribute to connection and sets it in notifyConnected().

*** I can't test this because currently the test suite doesn't
    exercise this code.  SF item 637243 is about that problem. ***


=== ZODB3/ZEO/StorageServer.py 1.74.2.3.2.2 => 1.74.2.3.2.3 ===
--- ZODB3/ZEO/StorageServer.py:1.74.2.3.2.2	Fri Nov  1 18:46:18 2002
+++ ZODB3/ZEO/StorageServer.py	Tue Nov 12 12:55:16 2002
@@ -206,6 +206,7 @@
 
     def __init__(self, server, read_only=0):
         self.server = server
+        self.connection = None
         self.client = None
         self.storage = None
         self.storage_id = "uninitialized"
@@ -215,6 +216,7 @@
         self.timeout.start()
 
     def notifyConnected(self, conn):
+        self.connection = conn # For restart_other() below
         self.client = self.ClientStorageStubClass(conn)
         self.timeout.notifyConnected(conn)
 
@@ -501,7 +503,7 @@
         except:
             self.log("Unexpected error handling waiting transaction",
                      level=zLOG.WARNING, error=sys.exc_info())
-            zeo_storage._conn.close()
+            zeo_storage.connection.close()
             return 0
         else:
             return 1