Merge pull request #14615 from ioforks/fix-14476-packaging-npe

Fix NPE when packaging uber-jar on Openshift
quarkusio · Jan 26, 2021 · 28f2e85 · 28f2e85
2 parents 91a82d2 + 0b5385e
commit 28f2e85
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/...ent/src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftProcessor.java b/...ent/src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftProcessor.java
@@ -267,9 +267,12 @@ public void openshiftBuildFromJar(OpenshiftConfig openshiftConfig,
         if (packageConfig.isFastJar()) {
             createContainerImage(kubernetesClient, openshiftYml.get(), config, contextRoot, jar.getPath().getParent(),
                     jar.getPath().getParent());
-        } else {
+        } else if (jar.getLibraryDir() != null) { //When using uber-jar the libraryDir is going to be null, potentially causing NPE.
             createContainerImage(kubernetesClient, openshiftYml.get(), config, contextRoot, jar.getPath().getParent(),
                     jar.getPath(), jar.getLibraryDir());
+        } else {
+            createContainerImage(kubernetesClient, openshiftYml.get(), config, contextRoot, jar.getPath().getParent(),
+                    jar.getPath());
         }
         artifactResultProducer.produce(new ArtifactResultBuildItem(null, "jar-container", Collections.emptyMap()));
     }