HHH-12540 - Reusing same EntityTransaction with JTA enabled

Author: dreab8

hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java

@@ -212,6 +212,7 @@ protected void addSharedSessionTransactionObserver(TransactionCoordinator transa
 	}
 
 	protected void removeSharedSessionTransactionObserver(TransactionCoordinator transactionCoordinator) {
+		transactionCoordinator.invalidate();
 	}
 
 	@Override

hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java

@@ -2741,6 +2741,7 @@ public void afterCompletion(boolean successful, boolean delayed) {
 
 	@Override
 	protected void removeSharedSessionTransactionObserver(TransactionCoordinator transactionCoordinator) {
+		super.removeSharedSessionTransactionObserver( transactionCoordinator );
 		transactionCoordinator.removeObserver( transactionObserver );
 	}
 

hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionCoordinatorImpl.java

@@ -118,7 +118,6 @@ public JtaTransactionCoordinatorImpl(
 		synchronizationRegistered = false;
 
 		pulse();
-
 	}
 
 	/**
@@ -337,6 +336,14 @@ public int getTimeOut() {
 		return this.timeOut;
 	}
 
+	@Override
+	public void invalidate() {
+		if ( physicalTransactionDelegate != null ) {
+			physicalTransactionDelegate.invalidate();
+		}
+		physicalTransactionDelegate = null;
+	}
+
 	// SynchronizationCallbackTarget ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 	@Override
@@ -377,11 +384,6 @@ public void afterCompletion(boolean successful, boolean delayed) {
 			observer.afterCompletion( successful, delayed );
 		}
 
-		if ( physicalTransactionDelegate != null ) {
-			physicalTransactionDelegate.invalidate();
-		}
-
-		physicalTransactionDelegate = null;
 		synchronizationRegistered = false;
 	}
 
@@ -394,7 +396,6 @@ public void removeObserver(TransactionObserver observer) {
 		observers.remove( observer );
 	}
 
-
 	/**
 	 * Implementation of the LocalInflow for this TransactionCoordinator.  Allows the
 	 * local transaction ({@link org.hibernate.Transaction} to callback into this

hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/TransactionCoordinator.java

@@ -106,6 +106,8 @@ default boolean isTransactionActive(boolean isMarkedRollbackConsideredActive) {
 		return isJoined() && getTransactionDriverControl().isActive( isMarkedRollbackConsideredActive );
 	}
 
+	default void invalidate(){}
+
 	/**
 	 * Provides the means for "local transactions" (as transaction drivers) to control the
 	 * underlying "physical transaction" currently associated with the TransactionCoordinator.