Mark transaction as inactive in JtaTransactionManager during AfterCom…

…pletion to invalidate transaction ThreadLocal

ebean-api/src/main/java/io/ebean/Transaction.java

@@ -211,6 +211,8 @@ static Transaction current() {
    */
   boolean isActive();
 
+  void setActive(boolean active);
+
   /**
    * Set the behavior for document store updates on this transaction.
    * <p>

ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java

@@ -238,6 +238,11 @@ public boolean isActive() {
     return transaction.isActive();
   }
 
+  @Override
+  public void setActive(boolean active) {
+    transaction.setActive(active);
+  }
+
   @Override
   public void setPersistCascade(boolean persistCascade) {
     transaction.setPersistCascade(persistCascade);

ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java

@@ -617,6 +617,11 @@ public boolean isActive() {
     return active;
   }
 
+  @Override
+  public void setActive(boolean active) {
+    this.active = active;
+  }
+
   @Override
   public boolean isPersistCascade() {
     return false;

ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java

@@ -1082,6 +1082,11 @@ public boolean isActive() {
     return active;
   }
 
+  @Override
+  public void setActive(boolean active) {
+    this.active = active;
+  }
+
   @Override
   public final boolean isPersistCascade() {
     return persistCascade;

ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java

@@ -94,9 +94,16 @@ public Object getCurrentTransaction() {
     // check current Ebean transaction
     SpiTransaction currentEbeanTransaction = scope.inScope();
     if (currentEbeanTransaction != null) {
-      // NOT expecting this so log WARNING
-      log.log(WARNING, "JTA Transaction - no current txn BUT using current Ebean one {0}", currentEbeanTransaction.id());
-      return currentEbeanTransaction;
+      if (currentEbeanTransaction.isActive()) {
+        // NOT expecting this so log WARNING
+        log.log(WARNING, "JTA Transaction - no current txn BUT using current Ebean one {0}", currentEbeanTransaction.id());
+        return currentEbeanTransaction;
+      } else {
+        log.log(WARNING, "JTA Transaction - no current txn, but found Ebean inactive transaction. Clearing.", currentEbeanTransaction.id());
+        // thread local references no longer active transaction. This can happen if the JtaTxnListener#afterCompletion
+        // was triggered by a different thread than the one which created the scope (ThreadLocal).
+        scope.clearExternal();
+      }
     }
 
     UserTransaction ut = userTransaction();
@@ -198,6 +205,7 @@ public void afterCompletion(int status) {
           log.log(DEBUG, "Jta Txn [{0}] rollback", transaction.id());
           transaction.postRollback(null);
           // Remove this transaction object as it is completed
+          transaction.setActive(false);
           transactionManager.scope().clearExternal();
           break;
 

ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java

@@ -67,6 +67,12 @@ public boolean isActive() {
     return false;
   }
 
+  @Override
+  public void setActive(boolean active) {
+
+  }
+
+
   @Override
   public void commitAndContinue() {
     // do nothing