Merge pull request #20608 from stuartwdouglas/context-leak-fix

Fix potential request context leak
quarkusio · Oct 8, 2021 · 609865a · 609865a
2 parents 11d725c + 8ab2d77
commit 609865a
Showing 1 changed file with 5 additions and 3 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
@@ -143,9 +143,7 @@ public void run() {
                         synchronized (this) {
                             if (isRequestScopeManagementRequired()) {
                                 if (requestScopeActivated) {
-                                    if (position != handlers.length) {
-                                        disasociateRequestScope = true;
-                                    }
+                                    disasociateRequestScope = true;
                                     requestScopeActivated = false;
                                 }
                             } else {
@@ -176,6 +174,10 @@ public void run() {
             // 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) || aborted) {
+                if (requestScopeActivated) {
+                    requestScopeDeactivated();
+                    currentRequestScope.deactivate();
+                }
                 close();
             } else {
                 if (disasociateRequestScope) {