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

[Jeremy Hylton]

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

Modified Files:
	ClientStorage.py 
Log Message:
Move tpc_abort() below tpc_begin().


=== ZODB3/ZEO/ClientStorage.py 1.49 => 1.50 ===
--- ZODB3/ZEO/ClientStorage.py:1.49	Fri Aug 16 18:48:35 2002
+++ ZODB3/ZEO/ClientStorage.py	Fri Aug 16 18:49:40 2002
@@ -322,20 +322,6 @@
         self._server.vote(self._serial)
         return self._check_serials()
 
-    def tpc_abort(self, transaction):
-        if transaction is not self._transaction:
-            return
-        try:
-            self._server.tpc_abort(self._serial)
-            self._tbuf.clear()
-            self._seriald.clear()
-            del self._serials[:]
-        finally:
-            self.tpc_cond.acquire()
-            self._transaction = None
-            self.tpc_cond.notify()
-            self.tpc_cond.release()
-
     def tpc_begin(self, transaction, tid=None, status=' '):
         self.tpc_cond.acquire()
         while self._transaction is not None:
@@ -374,6 +360,20 @@
         self._serial = id
         self._seriald.clear()
         del self._serials[:]
+
+    def tpc_abort(self, transaction):
+        if transaction is not self._transaction:
+            return
+        try:
+            self._server.tpc_abort(self._serial)
+            self._tbuf.clear()
+            self._seriald.clear()
+            del self._serials[:]
+        finally:
+            self.tpc_cond.acquire()
+            self._transaction = None
+            self.tpc_cond.notify()
+            self.tpc_cond.release()
 
     def tpc_finish(self, transaction, f=None):
         if transaction is not self._transaction: