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

Jeremy Hylton jeremy@zope.com
Thu, 29 Aug 2002 16:59:04 -0400


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

Modified Files:
	StorageServer.py 
Log Message:
When closing a storage connection, do the whole tpc_abort() dance.

The previous code just called tpc_abort() on the server, but that
wouldn't restart any waiting transaction.


=== ZEO/ZEO/StorageServer.py 1.47 => 1.48 ===
--- ZEO/ZEO/StorageServer.py:1.47	Thu Aug 29 15:41:14 2002
+++ ZEO/ZEO/StorageServer.py	Thu Aug 29 16:59:03 2002
@@ -127,8 +127,7 @@
         # When this storage closes, we must ensure that it aborts
         # any pending transaction.  Not sure if this is the clearest way.
         if self._transaction is not None:
-            self.__storage.tpc_abort(self._transaction)
-            self._transaction = None
+            self.tpc_abort(self._transaction.id)
         self._conn.close()
 
     def notifyConnected(self, conn):