Merge pull request #42794 from zakkak/2024-08-27-fix-NPE

Avoid `NullPointerException`s when application fails to start
quarkusio · Aug 27, 2024 · b7a4302 · b7a4302
2 parents 6a41ad8 + 80bf54c
commit b7a4302
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/ApplicationLifecycleManager.java b/core/runtime/src/main/java/io/quarkus/runtime/ApplicationLifecycleManager.java
@@ -452,13 +452,15 @@ public void run() {
             }
             //take a reliable reference before changing the application state:
             final Application app = currentApplication;
-            if (app.isStarted()) {
-                // On CLI apps, SIGINT won't call io.quarkus.runtime.Application#stop(),
-                // making the awaitShutdown() below block the application termination process
-                // It should be a noop if called twice anyway
-                app.stop();
+            if (app != null) {
+                if (app.isStarted()) {
+                    // On CLI apps, SIGINT won't call io.quarkus.runtime.Application#stop(),
+                    // making the awaitShutdown() below block the application termination process
+                    // It should be a noop if called twice anyway
+                    app.stop();
+                }
+                app.awaitShutdown();
             }
-            app.awaitShutdown();
             currentApplication = null;
             System.out.flush();
             System.err.flush();