[Zodb-checkins] CVS: Packages/ZODB - BaseStorage.py:1.34.4.6

[Tim Peters]

Update of /cvs-repository/Packages/ZODB
In directory cvs.zope.org:/tmp/cvs-serv6225/ZODB

Modified Files:
      Tag: Zope-2_7-branch
	BaseStorage.py 
Log Message:
tpc_abort():  Repair fubar'ed "repaired" logic.


=== Packages/ZODB/BaseStorage.py 1.34.4.5 => 1.34.4.6 ===
--- Packages/ZODB/BaseStorage.py:1.34.4.5	Wed Oct  5 15:03:59 2005
+++ Packages/ZODB/BaseStorage.py	Wed Oct  5 15:31:01 2005
@@ -141,11 +141,13 @@
         try:
             if transaction is not self._transaction:
                 return
-            self._abort()
-            self._clear_temp()
-            self._transaction = None
+            try:
+                self._abort()
+                self._clear_temp()
+                self._transaction = None
+            finally:
+                self._commit_lock_release()
         finally:
-            self._commit_lock_release()
             self._lock_release()
 
     def _abort(self):