HHH-8586 Synchronization beforeCompletion/afterCompletion should check if EM is closed and this helps us pass the tck entityManagerFactoryCloseExceptions test.

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

@@ -346,6 +346,11 @@ public class TransactionCoordinatorImpl implements TransactionCoordinator {
 		synchronizationRegistry.notifySynchronizationsAfterTransactionCompletion( status );
 	}
 
+	@Override
+	public boolean isActive() {
+		return !sessionFactory().isClosed();
+	}
+
 
 	// serialization ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

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

@@ -141,4 +141,6 @@ public interface TransactionCoordinator extends Serializable {
 	public void sendBeforeTransactionCompletionNotifications(TransactionImplementor hibernateTransaction);
 	public void sendAfterTransactionCompletionNotifications(TransactionImplementor hibernateTransaction, int status);
 
+	public boolean isActive();
+
 }

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

@@ -95,6 +95,10 @@ public class SynchronizationCallbackCoordinatorImpl implements SynchronizationCa
 	public void beforeCompletion() {
 		LOG.trace( "Transaction before completion callback" );
 
+		if ( !transactionCoordinator.isActive() ) {
+			return;
+		}
+
 		boolean flush;
 		try {
 			final int status = transactionCoordinator.getTransactionContext().getTransactionEnvironment()
@@ -160,6 +164,9 @@ public class SynchronizationCallbackCoordinatorImpl implements SynchronizationCa
 
 	private void doAfterCompletion(int status) {
 		LOG.tracev( "Transaction afterCompletion callback [status={0}]", status );
+		if ( !transactionCoordinator.isActive() ) {
+			return;
+		}
 
 		try {
 			afterCompletionAction.doAction( transactionCoordinator, status );

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

@@ -120,7 +120,7 @@ public abstract class AbstractSessionImpl
 
 	@Override
 	public boolean isClosed() {
-		return closed;
+		return closed || factory.isClosed();
 	}
 
 	protected void setClosed() {
@@ -128,7 +128,7 @@ public abstract class AbstractSessionImpl
 	}
 
 	protected void errorIfClosed() {
-		if ( closed ) {
+		if ( isClosed() ) {
 			throw new SessionException( "Session is closed!" );
 		}
 	}

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/EntityManagerFactoryClosedTest.java

@@ -0,0 +1,100 @@
+//$Id$
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors.  All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA  02110-1301  USA
+ */
+package org.hibernate.jpa.test;
+
+import org.hibernate.engine.transaction.internal.jta.JtaStatusHelper;
+import org.hibernate.jpa.AvailableSettings;
+import org.hibernate.testing.jta.TestingJtaBootstrap;
+import org.hibernate.testing.jta.TestingJtaPlatformImpl;
+import org.junit.Test;
+
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+
+import java.util.Map;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+
+/**
+ * EntityManagerFactoryClosedTest
+ *
+ * @author Scott Marlow
+ */
+public class EntityManagerFactoryClosedTest extends BaseEntityManagerFunctionalTestCase {
+
+	@Override
+	protected void addConfigOptions(Map options) {
+		super.addConfigOptions( options );
+		TestingJtaBootstrap.prepare(options);
+		options.put( AvailableSettings.TRANSACTION_TYPE, "JTA" );
+	}
+
+	/**
+	 * Test that using a closed EntityManagerFactory throws an IllegalStateException
+	 * Also ensure that HHH-8586 doesn't regress.
+	 * @throws Exception
+	 */
+	@Test
+	public void testWithTransactionalEnvironment() throws Exception {
+
+		assertFalse( JtaStatusHelper.isActive(TestingJtaPlatformImpl.INSTANCE.getTransactionManager()) );
+		TestingJtaPlatformImpl.INSTANCE.getTransactionManager().begin();
+		assertTrue( JtaStatusHelper.isActive(TestingJtaPlatformImpl.INSTANCE.getTransactionManager()) );
+		EntityManagerFactory entityManagerFactory = entityManagerFactory();
+
+		entityManagerFactory.close();	// close the underlying entity manager factory
+
+		try {
+			entityManagerFactory.createEntityManager();
+			fail( "expected IllegalStateException when calling emf.createEntityManager with closed emf" );
+		} catch( IllegalStateException expected ) {
+			// success
+
+		}
+
+		try {
+			entityManagerFactory.getCriteriaBuilder();
+			fail( "expected IllegalStateException when calling emf.getCriteriaBuilder with closed emf" );
+		} catch( IllegalStateException expected ) {
+			// success
+		}
+
+		try {
+			entityManagerFactory.getCache();
+			fail( "expected IllegalStateException when calling emf.getCache with closed emf" );
+		} catch( IllegalStateException expected ) {
+			// success
+		}
+
+		assertFalse( entityManagerFactory.isOpen() );
+
+		TestingJtaPlatformImpl.INSTANCE.getTransactionManager().commit();
+	}
+
+}