[Zope3-checkins] CVS: Zope3/src/transaction - _transaction.py:1.1.2.18

Jeremy Hylton jeremy at zope.com
Mon Mar 22 15:29:24 EST 2004


Update of /cvs-repository/Zope3/src/transaction
In directory cvs.zope.org:/tmp/cvs-serv31123

Modified Files:
      Tag: jeremy-txn-branch
	_transaction.py 
Log Message:
Forgot to call free() from abort().
Put free() calls before synchronizer afterCompletion().


=== Zope3/src/transaction/_transaction.py 1.1.2.17 => 1.1.2.18 ===
--- Zope3/src/transaction/_transaction.py:1.1.2.17	Mon Mar 22 12:19:39 2004
+++ Zope3/src/transaction/_transaction.py	Mon Mar 22 15:29:23 2004
@@ -171,9 +171,9 @@
         if subtransaction:
             self._resources = []
         else:
+            self._manager.free(self)
             for s in self._synchronizers:
                 s.afterCompletion()
-            self._manager.free(self)
 
     def _commitResources(self, subtransaction):
         # Execute the two-phase commit protocol.
@@ -290,6 +290,7 @@
                                    rm, exc_info=sys.exc_info())
 
         if not subtransaction:
+            self._manager.free(self)
             for s in self._synchronizers:
                 s.afterCompletion()
 




More information about the Zope3-Checkins mailing list