add null check for when CDI is disabled

OpenLiberty · Oct 2, 2024 · b3bab87 · b3bab87
1 parent e368739
commit b3bab87
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/dev/com.ibm.ws.cdi.weld/src/com/ibm/ws/cdi/impl/AbstractCDIRuntime.java b/dev/com.ibm.ws.cdi.weld/src/com/ibm/ws/cdi/impl/AbstractCDIRuntime.java
@@ -182,7 +182,7 @@ public CDI<Object> getCDI() {
         }
 
         //If we can't get CDI from the thread context metadata, fallback to matching the TCCL against apps.
-        if (cdi == null) {
+        if (runtimeFactory != null && cdi == null) {
             Collection<Application> applications = runtimeFactory.getApplications();
 
             ClassLoader tccl = AccessController.doPrivileged((PrivilegedAction<ClassLoader>) () -> {
@@ -194,17 +194,24 @@ public CDI<Object> getCDI() {
             for (Application application : applications) {
                 if (application.getClassLoader().equals(tccl)
                     || classLoadingService.isThreadContextClassLoaderForAppClassLoader(tccl, application.getClassLoader())) {
-                    WebSphereCDIDeployment deploymnet = cdiContainer.getDeployment(application);
-                    cdi = deploymnet.getCDI();
+                    deployment = cdiContainer.getDeployment(application);
+                    //We found the correct app but it has no deployment, this happens if CDI is disabled.
+                    if (deployment != null) {
+                        cdi = deployment.getCDI();
+                    }
                     break;
                 }
             }
         }
 
-        if (cdi == null) {
+        if (deployment == null) {
             throw new IllegalStateException("Could not find deployment");
         }
 
+        if (cdi == null) {
+            throw new IllegalStateException("Could not find CDI");
+        }
+
         return cdi;
     }