[Zodb-checkins] SVN: ZODB/branches/3.5/src/ZODB/BaseStorage.py Merge rev 38773 from 3.4 branch.

[Tim Peters]

Log message for revision 38775:
  Merge rev 38773 from 3.4 branch.
  
  tpc_abort():  Repair fubar'ed "repaired" logic.
  

Changed:
  U   ZODB/branches/3.5/src/ZODB/BaseStorage.py

-=-
Modified: ZODB/branches/3.5/src/ZODB/BaseStorage.py
===================================================================
--- ZODB/branches/3.5/src/ZODB/BaseStorage.py	2005-10-05 19:46:16 UTC (rev 38774)
+++ ZODB/branches/3.5/src/ZODB/BaseStorage.py	2005-10-05 19:46:30 UTC (rev 38775)
@@ -189,11 +189,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):