Merge pull request payara#3209 from jGauravGupta/PAYARA-3119

PAYARA-3119 NullPointerException when starting Jersey/EJB Containers in Order
MarkWareham · Oct 11, 2018 · 3b6f3b5 · 3b6f3b5
1 parent 90fecf0
commit 3b6f3b5
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/BaseContainer.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/BaseContainer.java
@@ -512,6 +512,8 @@ public enum ContainerType {
 
     protected InterceptorManager interceptorManager;
 
+    private Set<Object> pendingInterceptors = new HashSet<>();
+
     // the order must be the same as CallbackType and getPre30LifecycleMethodNames
     private static final Class[] lifecycleCallbackAnnotationClasses = {
         AroundConstruct.class, 
@@ -3446,16 +3448,25 @@ protected String[] getPre30LifecycleMethodNames() {
         };
     };
 
-    private void initializeInterceptorManager() throws Exception {
+    private synchronized void initializeInterceptorManager() throws Exception {
         this.interceptorManager = new InterceptorManager(_logger, this,
                 lifecycleCallbackAnnotationClasses,
                 getPre30LifecycleMethodNames());
+        if (!pendingInterceptors.isEmpty()) {
+            pendingInterceptors.forEach(this::registerSystemInterceptor);
+            pendingInterceptors.clear();
+        }
     }
 
-    void registerSystemInterceptor(Object o) {
-
+    void registerSystemInterceptor(Object interceptor) {
         if (needSystemInterceptorProxy()) {
-            interceptorManager.registerRuntimeInterceptor(o);
+            synchronized (this) {
+                if (interceptorManager == null) {
+                    pendingInterceptors.add(interceptor);
+                } else {
+                    interceptorManager.registerRuntimeInterceptor(interceptor);
+                }
+            }
         }
     }