Scheduled methods - mark vertx context as safe

- fixes quarkusio#25257
gsmet · Apr 29, 2022 · cc4aef5 · cc4aef5
1 parent 5e8584f
commit cc4aef5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/extensions/quartz/runtime/src/main/java/io/quarkus/quartz/runtime/QuartzScheduler.java b/extensions/quartz/runtime/src/main/java/io/quarkus/quartz/runtime/QuartzScheduler.java
@@ -73,7 +73,9 @@
 import io.quarkus.scheduler.common.runtime.StatusEmitterInvoker;
 import io.quarkus.scheduler.common.runtime.util.SchedulerUtils;
 import io.quarkus.scheduler.runtime.SchedulerRuntimeConfig;
+import io.quarkus.vertx.core.runtime.context.VertxContextSafetyToggle;
 import io.smallrye.common.vertx.VertxContext;
+import io.vertx.core.Context;
 import io.vertx.core.Handler;
 import io.vertx.core.Vertx;
 
@@ -555,20 +557,22 @@ static class InvokerJob implements Job {
         }
 
         @Override
-        public void execute(JobExecutionContext context) throws JobExecutionException {
+        public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
             if (trigger.invoker != null) { // could be null from previous runs
                 if (trigger.invoker.isBlocking()) {
                     try {
-                        trigger.invoker.invoke(new QuartzScheduledExecution(trigger, context));
+                        trigger.invoker.invoke(new QuartzScheduledExecution(trigger, jobExecutionContext));
                     } catch (Exception e) {
                         throw new JobExecutionException(e);
                     }
                 } else {
-                    VertxContext.getOrCreateDuplicatedContext(vertx).runOnContext(new Handler<Void>() {
+                    Context context = VertxContext.getOrCreateDuplicatedContext(vertx);
+                    VertxContextSafetyToggle.setContextSafe(context, true);
+                    context.runOnContext(new Handler<Void>() {
                         @Override
                         public void handle(Void event) {
                             try {
-                                trigger.invoker.invoke(new QuartzScheduledExecution(trigger, context));
+                                trigger.invoker.invoke(new QuartzScheduledExecution(trigger, jobExecutionContext));
                             } catch (Exception e) {
                                 // already logged by the StatusEmitterInvoker
                             }

diff --git a/extensions/scheduler/runtime/src/main/java/io/quarkus/scheduler/runtime/SimpleScheduler.java b/extensions/scheduler/runtime/src/main/java/io/quarkus/scheduler/runtime/SimpleScheduler.java
@@ -51,6 +51,7 @@
 import io.quarkus.scheduler.common.runtime.SkipPredicateInvoker;
 import io.quarkus.scheduler.common.runtime.StatusEmitterInvoker;
 import io.quarkus.scheduler.common.runtime.util.SchedulerUtils;
+import io.quarkus.vertx.core.runtime.context.VertxContextSafetyToggle;
 import io.smallrye.common.vertx.VertxContext;
 import io.vertx.core.Context;
 import io.vertx.core.Handler;
@@ -319,6 +320,7 @@ public void run() {
                     }
                 } else {
                     Context context = VertxContext.getOrCreateDuplicatedContext(vertx);
+                    VertxContextSafetyToggle.setContextSafe(context, true);
                     context.runOnContext(new Handler<Void>() {
                         @Override
                         public void handle(Void event) {