Merge pull request #42208 from Sanne/ShutdownRace

Avoid a possible NPE during application stop
quarkusio · Jul 29, 2024 · a02d772 · a02d772
2 parents b31c632 + 0e74800
commit a02d772
Showing 1 changed file with 5 additions and 3 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
@@ -429,13 +429,15 @@ public void run() {
             } finally {
                 stateLock.unlock();
             }
-            if (currentApplication.isStarted()) {
+            //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
-                currentApplication.stop();
+                app.stop();
             }
-            currentApplication.awaitShutdown();
+            app.awaitShutdown();
             currentApplication = null;
             System.out.flush();
             System.err.flush();