Avoid a potential NPE

quarkusio · Jun 20, 2022 · 935ce8b · 935ce8b
1 parent a06b438
commit 935ce8b
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/extensions/mutiny/runtime/src/main/java/io/quarkus/mutiny/runtime/MutinyInfrastructure.java b/extensions/mutiny/runtime/src/main/java/io/quarkus/mutiny/runtime/MutinyInfrastructure.java
@@ -28,14 +28,14 @@ public void configureMutinyInfrastructure(ExecutorService executor, ShutdownCont
         MutinyScheduler mutinyScheduler = new MutinyScheduler(executor) {
             @Override
             protected <V> RunnableScheduledFuture<V> decorateTask(Runnable runnable, RunnableScheduledFuture<V> task) {
-                return super.decorateTask(runnable,
-                        new ContextualRunnableScheduledFuture<>(contextHandler, contextHandler.captureContext(), task));
+                Object context = (contextHandler != null) ? contextHandler.captureContext() : null;
+                return super.decorateTask(runnable, new ContextualRunnableScheduledFuture<>(contextHandler, context, task));
             }
 
             @Override
             protected <V> RunnableScheduledFuture<V> decorateTask(Callable<V> callable, RunnableScheduledFuture<V> task) {
-                return super.decorateTask(callable,
-                        new ContextualRunnableScheduledFuture<>(contextHandler, contextHandler.captureContext(), task));
+                Object context = (contextHandler != null) ? contextHandler.captureContext() : null;
+                return super.decorateTask(callable, new ContextualRunnableScheduledFuture<>(contextHandler, context, task));
             }
         };
         Infrastructure.setDefaultExecutor(new ScheduledExecutorService() {