Merge pull request wildfly#11983 from scottmarlow/WFLY-11563_Persiste…

…nceUnitServiceImplNPE WFLY-11563 Race condition in PersistenceUnitServiceImpl when the service is being stopped
mjurc · Jan 9, 2019 · 99bfad8 · 99bfad8
2 parents 6dfee69 + 31ac8dc
commit 99bfad8
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 13 deletions.
diff --git a/jpa/subsystem/src/main/java/org/jboss/as/jpa/service/PersistenceUnitServiceImpl.java b/jpa/subsystem/src/main/java/org/jboss/as/jpa/service/PersistenceUnitServiceImpl.java
@@ -250,18 +250,23 @@ public Void run() {
                                 }
                                 try {
                                     if (entityManagerFactory != null) {
-                                        WritableServiceBasedNamingStore.pushOwner(deploymentUnitServiceName);
-                                        try {
-                                            if (entityManagerFactory.isOpen()) {
-                                                entityManagerFactory.close();
+                                        // protect against race condition reported by WFLY-11563
+                                        synchronized (this) {
+                                            if (entityManagerFactory != null) {
+                                                WritableServiceBasedNamingStore.pushOwner(deploymentUnitServiceName);
+                                                try {
+                                                    if (entityManagerFactory.isOpen()) {
+                                                        entityManagerFactory.close();
+                                                    }
+                                                } catch (Throwable t) {
+                                                    ROOT_LOGGER.failedToStopPUService(t, pu.getScopedPersistenceUnitName());
+                                                } finally {
+                                                    entityManagerFactory = null;
+                                                    pu.setTempClassLoaderFactory(null);
+                                                    WritableServiceBasedNamingStore.popOwner();
+                                                    persistenceUnitRegistry.remove(getScopedPersistenceUnitName());
+                                                }
                                             }
-                                        } catch (Throwable t) {
-                                            ROOT_LOGGER.failedToStopPUService(t, pu.getScopedPersistenceUnitName());
-                                        } finally {
-                                            entityManagerFactory = null;
-                                            pu.setTempClassLoaderFactory(null);
-                                            WritableServiceBasedNamingStore.popOwner();
-                                            persistenceUnitRegistry.remove(getScopedPersistenceUnitName());
                                         }
                                     }
                                 } finally {
@@ -271,8 +276,12 @@ public Void run() {
                                     }
                                 }
                                 if (proxyBeanManager != null) {
-                                    proxyBeanManager.setDelegate(null);
-                                    proxyBeanManager = null;
+                                    synchronized (this) {
+                                        if (proxyBeanManager != null) {
+                                            proxyBeanManager.setDelegate(null);
+                                            proxyBeanManager = null;
+                                        }
+                                    }
                                 }
                                 context.complete();
                                 return null;

diff --git a/...jboss/as/test/integration/jpa/mockprovider/classtransformer/TestEntityManagerFactory.java b/...jboss/as/test/integration/jpa/mockprovider/classtransformer/TestEntityManagerFactory.java
@@ -41,6 +41,9 @@ public class TestEntityManagerFactory implements InvocationHandler {
     public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 
         invocations.add(method.getName());
+        if (method.getName().equals("isOpen")) {
+            return false;
+        }
         return null;
 
     }