HHH-8254 throw HibernateException when transaction is rolledback by a

reaper thread
Conflicts:
	hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/transaction/TransactionJoiningTest.java

Author: brmeyer

hibernate-core/src/main/java/org/hibernate/engine/transaction/synchronization/internal/SynchronizationCallbackCoordinatorImpl.java

@@ -25,6 +25,7 @@
 
 import javax.transaction.SystemException;
 
+import org.hibernate.HibernateException;
 import org.hibernate.TransactionException;
 import org.hibernate.cfg.Settings;
 import org.hibernate.engine.transaction.internal.jta.JtaStatusHelper;
@@ -55,9 +56,9 @@ public class SynchronizationCallbackCoordinatorImpl implements SynchronizationCa
 	private AfterCompletionAction afterCompletionAction;
 	private ExceptionMapper exceptionMapper;
 
-	private long registrationThreadId;
+	private volatile long registrationThreadId;
 	private final int NO_STATUS = -1;
-	private int delayedCompletionHandlingStatus;
+	private volatile int delayedCompletionHandlingStatus;
 
 	public SynchronizationCallbackCoordinatorImpl(TransactionCoordinator transactionCoordinator) {
 		this.transactionCoordinator = transactionCoordinator;
@@ -153,11 +154,12 @@ public void delayedAfterCompletion() {
 		if ( delayedCompletionHandlingStatus != NO_STATUS ) {
 			doAfterCompletion( delayedCompletionHandlingStatus );
 			delayedCompletionHandlingStatus = NO_STATUS;
+			throw new HibernateException("Transaction was rolled back in a different thread!");
 		}
 	}
 
 	private void doAfterCompletion(int status) {
-		LOG.tracev( "Transaction after completion callback [status={0}]", status );
+		LOG.tracev( "Transaction afterCompletion callback [status={0}]", status );
 
 		try {
 			afterCompletionAction.doAction( transactionCoordinator, status );

hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/transaction/TransactionJoiningTest.java

@@ -23,24 +23,26 @@
  */
 package org.hibernate.ejb.test.transaction;
 
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 
 import javax.persistence.EntityManager;
+import javax.persistence.PersistenceException;
 import javax.transaction.Status;
 import javax.transaction.Synchronization;
 
+import org.hibernate.HibernateException;
 import org.hibernate.Session;
 import org.hibernate.Transaction;
 import org.hibernate.ejb.AvailableSettings;
 import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase;
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.engine.transaction.internal.jta.CMTTransaction;
 import org.hibernate.engine.transaction.internal.jta.JtaStatusHelper;
+import org.hibernate.exception.GenericJDBCException;
 import org.hibernate.internal.SessionImpl;
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.jta.TestingJtaBootstrap;
@@ -186,32 +188,46 @@ public void afterCompletion( int i ) {
 	 * See HHH-7910
 	 */
 	@Test
-	@TestForIssue(jiraKey="HHH-7910")
+	@TestForIssue(jiraKey = "HHH-7910")
 	public void testMultiThreadTransactionTimeout() throws Exception {
 		TestingJtaPlatformImpl.INSTANCE.getTransactionManager().begin();
-		
+
 		EntityManager em = entityManagerFactory().createEntityManager();
 		final SessionImpl sImpl = em.unwrap( SessionImpl.class );
-		
-		final CountDownLatch latch = new CountDownLatch(1);
-		
+
+		final CountDownLatch latch = new CountDownLatch( 1 );
+
 		Thread thread = new Thread() {
 			public void run() {
-				sImpl.getTransactionCoordinator().getSynchronizationCallbackCoordinator().afterCompletion( Status.STATUS_ROLLEDBACK );
+				sImpl.getTransactionCoordinator().getSynchronizationCallbackCoordinator()
+						.afterCompletion( Status.STATUS_ROLLEDBACK );
 				latch.countDown();
 			}
 		};
 		thread.start();
-		
+
 		latch.await();
-		
-		em.persist( new Book( "The Book of Foo", 1 ) );
-		
-		// Ensure that the session was cleared by the background thread.
-		assertEquals( "The background thread did not clear the session as expected!",
-				0, em.createQuery( "from Book" ).getResultList().size() );
 
-		TestingJtaPlatformImpl.INSTANCE.getTransactionManager().commit();
+		boolean caught = false;
+		try {
+			em.persist( new Book( "The Book of Foo", 1 ) );
+		}
+		catch ( PersistenceException e ) {
+			caught = e.getCause().getClass().equals( HibernateException.class );
+		}
+		assertTrue( caught );
+
+		// Ensure that the connection was closed by the background thread.
+		caught = false;
+		try {
+			em.createQuery( "from Book" ).getResultList();
+		}
+		catch ( PersistenceException e ) {
+			caught = e.getCause().getClass().equals( GenericJDBCException.class );
+		}
+		assertTrue( caught );
+
+		TestingJtaPlatformImpl.INSTANCE.getTransactionManager().rollback();
 		em.close();
 	}