Merge pull request #40385 from stuartwdouglas/37323

Don't close connection if response is sent
quarkusio · May 1, 2024 · dfc948c · dfc948c
2 parents dd32c69 + 23f07ab
commit dfc948c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/...src/main/java/org/jboss/resteasy/reactive/server/core/ResteasyReactiveRequestContext.java b/...src/main/java/org/jboss/resteasy/reactive/server/core/ResteasyReactiveRequestContext.java
@@ -640,7 +640,9 @@ protected void handleUnrecoverableError(Throwable throwable) {
 
     protected void endResponse() {
         if (serverResponse().headWritten()) {
-            serverRequest().closeConnection();
+            if (!serverResponse().closed()) {
+                serverRequest().closeConnection();
+            }
         } else {
             serverResponse().setStatusCode(500).end();
         }

diff --git a/...in/java/org/jboss/resteasy/reactive/server/vertx/VertxResteasyReactiveRequestContext.java b/...in/java/org/jboss/resteasy/reactive/server/vertx/VertxResteasyReactiveRequestContext.java
@@ -406,7 +406,7 @@ public void removeResponseHeader(String name) {
 
     @Override
     public boolean closed() {
-        return response.closed();
+        return response.ended() || response.closed();
     }
 
     @Override