Merge pull request #19984 from stuartwdouglas/cleanup-last

Release the context manager last
quarkusio · Sep 8, 2021 · 28acd97 · 28acd97
2 parents 4621f42 + ad11e63
commit 28acd97
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/...src/main/java/io/quarkus/smallrye/context/runtime/SmallRyeContextPropagationRecorder.java b/...src/main/java/io/quarkus/smallrye/context/runtime/SmallRyeContextPropagationRecorder.java
@@ -50,7 +50,8 @@ public void configureRuntime(ExecutorService executorService, ShutdownContext sh
         SmallRyeContextManager contextManager = builder.build();
 
         contextManagerProvider.registerContextManager(contextManager, Thread.currentThread().getContextClassLoader());
-        shutdownContext.addShutdownTask(new Runnable() {
+        //needs to be late, as running threads can re-create an implicit one
+        shutdownContext.addLastShutdownTask(new Runnable() {
             @Override
             public void run() {
                 contextManagerProvider.releaseContextManager(contextManager);