Merge rev 38773 from 3.4 branch.

tpc_abort(): Repair fubar'ed "repaired" logic.

Merge rev 38773 from 3.4 branch.
tpc_abort(): Repair fubar'ed "repaired" logic.
956bee58 · Tim Peters · 0f3707e0 · 956bee58
Commit 956bee58 authored Oct 05, 2005 by Tim Peters
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

src/ZODB/BaseStorage.py src/ZODB/BaseStorage.py +6 -4

No files found.
--- a/src/ZODB/BaseStorage.py
+++ b/src/ZODB/BaseStorage.py
@@ -189,11 +189,13 @@ class BaseStorage(UndoLogCompatible):
        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):