HHH-6897 fix for 'registry contains more than one (2) entity manager factories: EMF_BaseEntityManagerFunctionalTestCase' failure

scottmarlow · scottmarlow · commit 5e3775afe87f · 2012-01-04T13:59:17.000-05:00
diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/BaseEntityManagerFunctionalTestCase.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/BaseEntityManagerFunctionalTestCase.java
@@ -195,10 +195,13 @@ protected boolean createSchema() {
 	@After
 	@SuppressWarnings( {"UnusedDeclaration"})
 	public void releaseResources() {
-		releaseUnclosedEntityManagers();
-
-		if ( entityManagerFactory != null ) {
-			entityManagerFactory.close();
+		try {
+			releaseUnclosedEntityManagers();
+		}
+		finally {
+			if ( entityManagerFactory != null && entityManagerFactory.isOpen()) {
+				entityManagerFactory.close();
+			}
 		}
 		// Note we don't destroy the service registry as we are not the ones creating it
 	}
