HHH-8406 - fix for EntityManagerFactoryRegistry not being thread safe

hibernate · Aug 26, 2013 · 7146435 · 7146435
1 parent cd812b6
commit 7146435
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/...-entitymanager/src/main/java/org/hibernate/jpa/internal/EntityManagerFactoryRegistry.java b/...-entitymanager/src/main/java/org/hibernate/jpa/internal/EntityManagerFactoryRegistry.java
@@ -139,10 +139,11 @@ public EntityManagerFactory getNamedEntityManagerFactory(String name) throws Hib
 		if (entityManagerFactorySet == null) {
 			throw new HibernateException( "registry does not contain entity manager factory: " + name);
 		}
-
-		if (entityManagerFactorySet.size() > 1) {
-			throw new HibernateException( "registry contains more than one (" + entityManagerFactorySet.size()+ ") entity manager factories: " + name);
+		synchronized (entityManagerFactorySet) {
+			if (entityManagerFactorySet.size() > 1) {
+				throw new HibernateException( "registry contains more than one (" + entityManagerFactorySet.size()+ ") entity manager factories: " + name);
+			}
+			return entityManagerFactorySet.iterator().next();
 		}
-		return entityManagerFactorySet.iterator().next();
 	}
 }