Only activate request context in RESTEasy Reactive if it's not alread…

…y active Fixes: quarkusio#34693
geoand · Jul 13, 2023 · 41b11da · 41b11da
1 parent 26cb1bd
commit 41b11da
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/...ntime/src/main/java/io/quarkus/resteasy/reactive/common/runtime/ArcThreadSetupAction.java b/...ntime/src/main/java/io/quarkus/resteasy/reactive/common/runtime/ArcThreadSetupAction.java
@@ -15,16 +15,21 @@ public ArcThreadSetupAction(ManagedContext managedContext) {
 
     @Override
     public ThreadState activateInitial() {
-        managedContext.activate();
+        boolean wasActiveBefore = managedContext.isActive();
+        if (!wasActiveBefore) {
+            managedContext.activate();
+        }
         InjectableContext.ContextState state = managedContext.getState();
-        return toThreadState(state);
+        return toThreadState(state, wasActiveBefore);
     }
 
-    private ThreadState toThreadState(InjectableContext.ContextState state) {
+    private ThreadState toThreadState(InjectableContext.ContextState state, boolean wasActiveBefore) {
         return new ThreadState() {
             @Override
             public void close() {
-                managedContext.destroy(state);
+                if (!wasActiveBefore) {
+                    managedContext.destroy(state);
+                }
             }
 
             @Override
@@ -41,6 +46,6 @@ public void deactivate() {
 
     @Override
     public ThreadState currentState() {
-        return toThreadState(managedContext.getState());
+        return toThreadState(managedContext.getState(), false);
     }
 }