[geode] branch feature/GEODE-5624 updated: wip.

[eshu11]

This is an automated email from the ASF dual-hosted git repository.

eshu11 pushed a commit to branch feature/GEODE-5624
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/feature/GEODE-5624 by this 
push:
     new 8e85388  wip.
8e85388 is described below

commit 8e85388d62d6a1996faf2eebb43119796439803f
Author: eshu <e...@pivotal.io>
AuthorDate: Mon Aug 27 14:26:57 2018 -0700

    wip.
---
 .../src/main/java/org/apache/geode/internal/cache/TXState.java      | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

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 9be7f39..5263e2e 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
@@ -878,7 +878,7 @@ public class TXState implements TXStateInterface {
     }
   }
 
-  protected void doCleanup() {
+  void doCleanup() {
     IllegalArgumentException iae = null;
     try {
       this.closed = true;
@@ -1029,6 +1029,7 @@ public class TXState implements TXStateInterface {
    */
   @Override
   public synchronized void beforeCompletion() throws 
SynchronizationCommitConflictException {
+    proxy.getTxMgr().setTXState(null);
     if (this.closed) {
       throw new TXManagerCancelledException();
     }
@@ -1051,7 +1052,6 @@ public class TXState implements TXStateInterface {
   }
 
   void doBeforeCompletion() {
-    proxy.getTxMgr().setTXState(null);
     final long opStart = CachePerfStats.getStatTime();
     this.jtaLifeTime = opStart - getBeginTime();
 
@@ -1131,7 +1131,6 @@ public class TXState implements TXStateInterface {
           Assert.assertTrue(this.locks != null,
               "Gemfire Transaction afterCompletion called with illegal 
state.");
           try {
-            proxy.getTxMgr().setTXState(null);
             commit();
             saveTXCommitMessageForClientFailover();
           } catch (CommitConflictException error) {
@@ -1144,7 +1143,6 @@ public class TXState implements TXStateInterface {
           break;
         case Status.STATUS_ROLLEDBACK:
           this.jtaLifeTime = opStart - getBeginTime();
-          this.proxy.getTxMgr().setTXState(null);
           rollback();
           saveTXCommitMessageForClientFailover();
           this.proxy.getTxMgr().noteRollbackSuccess(opStart, this.jtaLifeTime, 
this);