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

[Jeremy Hylton]

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

Modified Files:
      Tag: ZODB3-3_1-branch
	StorageServer.py 
Log Message:
Fix bug in restart() of NBQueueEntry.

Add comments to the two queue entry classes to explain what kind of
object they are storing in self.client.


=== ZODB3/ZEO/StorageServer.py 1.74.2.12 => 1.74.2.13 ===
--- ZODB3/ZEO/StorageServer.py:1.74.2.12	Wed Aug 27 00:38:51 2003
+++ ZODB3/ZEO/StorageServer.py	Wed Aug 27 10:23:46 2003
@@ -223,7 +223,7 @@
 class WaitQueueEntry:
     def __init__(self, delay, client):
         self.delay = delay
-        self.client = client
+        self.client = client # ZEOStorage instance
 
     def restart(self, other):
         try:
@@ -238,7 +238,7 @@
 
 class NBQueueEntry:
     def __init__(self, client):
-        self.client = client
+        self.client = client # ClientStub.ClientStorage instance
 
     def restart(self, other):
         other.log("Calling voteRready")
@@ -247,7 +247,7 @@
         except:
             other.log("Unexpected error handling queued transaction",
                       level=zLOG.WARNING, error=sys.exc_info())
-            self.client.connection.close()
+            self.client.close()
             return 0
         else:
             return 1