Commit bd80ff45 authored by Tim Peters's avatar Tim Peters

Merge rev 38773 from 3.4 branch.

tpc_abort():  Repair fubar'ed "repaired" logic.
parent 7b5188f3
...@@ -189,11 +189,13 @@ class BaseStorage(UndoLogCompatible): ...@@ -189,11 +189,13 @@ class BaseStorage(UndoLogCompatible):
try: try:
if transaction is not self._transaction: if transaction is not self._transaction:
return return
self._abort() try:
self._clear_temp() self._abort()
self._transaction = None self._clear_temp()
self._transaction = None
finally:
self._commit_lock_release()
finally: finally:
self._commit_lock_release()
self._lock_release() self._lock_release()
def _abort(self): def _abort(self):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment