GEODE-3444: Release the locks held when beforeCompletion failed with CommitConflictException
Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/9b7dd54d Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/9b7dd54d Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/9b7dd54d Branch: refs/heads/feature/GEODE-1279 Commit: 9b7dd54d6b6798553cffe417344041d1a27918e7 Parents: 6be38ca Author: eshu <[email protected]> Authored: Wed Aug 16 10:24:53 2017 -0700 Committer: eshu <[email protected]> Committed: Wed Aug 16 10:24:53 2017 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/geode/internal/cache/TXState.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/9b7dd54d/geode-core/src/main/java/org/apache/geode/internal/cache/TXState.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXState.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXState.java index 55415e3..b01dacf 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXState.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXState.java @@ -1034,6 +1034,7 @@ public class TXState implements TXStateInterface { } catch (CommitConflictException commitConflict) { + cleanup(); this.proxy.getTxMgr().noteCommitFailure(opStart, this.jtaLifeTime, this); throw new SynchronizationCommitConflictException( LocalizedStrings.TXState_CONFLICT_DETECTED_IN_GEMFIRE_TRANSACTION_0
