Merge pull request #19490 from stuartwdouglas/19471

Fix RESTEasy Reactive race
quarkusio · Aug 19, 2021 · 1aa583e · 1aa583e
2 parents e5717a0 + b361dbe
commit 1aa583e
Showing 1 changed file with 12 additions and 15 deletions.
diff --git a/...rc/main/java/org/jboss/resteasy/reactive/common/core/AbstractResteasyReactiveContext.java b/...rc/main/java/org/jboss/resteasy/reactive/common/core/AbstractResteasyReactiveContext.java
@@ -125,14 +125,15 @@ public void run() {
         //if this is a blocking target we don't activate for the initial non-blocking part
         //unless there are pre-mapping filters as these may require CDI
         boolean disasociateRequestScope = false;
+        boolean aborted = false;
+        Executor exec = null;
         try {
             while (position < handlers.length) {
                 int pos = position;
                 position++; //increment before, as reset may reset it to zero
                 try {
                     handlers[pos].handle((T) this);
                     if (suspended) {
-                        Executor exec = null;
                         synchronized (this) {
                             if (isRequestScopeManagementRequired()) {
                                 if (requestScopeActivated) {
@@ -151,40 +152,29 @@ public void run() {
                                 exec = this.executor;
                                 // prevent future suspensions from re-submitting the task
                                 this.executor = null;
+                                return;
                             } else if (suspended) {
                                 running = false;
                                 processingSuspended = true;
                                 return;
                             }
                         }
-                        if (exec != null) {
-                            //outside sync block
-                            exec.execute(this);
-                            processingSuspended = true;
-                            return;
-                        }
                     }
                 } catch (Throwable t) {
-                    boolean over = handlers == abortHandlerChain;
+                    aborted = handlers == abortHandlerChain;
                     if (t instanceof PreserveTargetException) {
                         handleException(t.getCause(), true);
                     } else {
                         handleException(t);
                     }
-                    if (over) {
-                        running = false;
-                        return;
-                    }
                 }
             }
-            running = false;
         } catch (Throwable t) {
             handleUnrecoverableError(t);
-            running = false;
         } finally {
             // we need to make sure we don't close the underlying stream in the event loop if the task
             // has been offloaded to the executor
-            if (position == handlers.length && !processingSuspended) {
+            if ((position == handlers.length && !processingSuspended) || aborted) {
                 close();
             } else {
                 if (disasociateRequestScope) {
@@ -193,6 +183,13 @@ public void run() {
                 }
                 beginAsyncProcessing();
             }
+            synchronized (this) {
+                running = false;
+            }
+            if (exec != null) {
+                //outside sync block
+                exec.execute(this);
+            }
         }
     }