GEODE-3444: remove the redundant method calls.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/04867000 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/04867000 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/04867000 Branch: refs/heads/feature/GEODE-3447 Commit: 04867000f8ad33b34947c35278ad944380ff5f95 Parents: 1a67d46 Author: eshu <[email protected]> Authored: Thu Aug 17 16:47:39 2017 -0700 Committer: eshu <[email protected]> Committed: Thu Aug 17 16:47:39 2017 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/geode/internal/cache/TXState.java | 4 ---- 1 file changed, 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/04867000/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 b01dacf..662f7b0 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 @@ -1010,7 +1010,6 @@ public class TXState implements TXStateInterface { writer.beforeCommit(event); } } catch (TransactionWriterException twe) { - cleanup(); throw new CommitConflictException(twe); } catch (VirtualMachineError err) { // cleanup(); this allocates objects so I don't think we can do it - that leaves the TX @@ -1021,7 +1020,6 @@ public class TXState implements TXStateInterface { // now, so don't let this thread continue. throw err; } catch (Throwable t) { - cleanup(); // rollback the transaction! // Whenever you catch Error or Throwable, you must also // catch VirtualMachineError (see above). However, there is // _still_ a possibility that you are dealing with a cascading @@ -1031,8 +1029,6 @@ public class TXState implements TXStateInterface { throw new CommitConflictException(t); } } - - } catch (CommitConflictException commitConflict) { cleanup(); this.proxy.getTxMgr().noteCommitFailure(opStart, this.jtaLifeTime, this);
