Merge branch 'jetty-9.4.x-4376-asynccontentcomplete' into jetty-9.4.x…

…-4331-asyncCloseComplete
jetty · Nov 29, 2019 · 2fe92fc · 2fe92fc
2 parents f43a484 + abb7e3b
commit 2fe92fc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
@@ -968,6 +968,9 @@ protected void completed()
             }
         }
 
+        // release any aggregate buffer from a closing flush
+        _channel.getResponse().getHttpOutput().closed();
+
         if (event != null)
         {
             cancelTimeout(event);

diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
@@ -234,6 +234,8 @@ private void write(ByteBuffer content, boolean complete) throws IOException
         {
             write(content, complete, blocker);
             blocker.block();
+            if (complete)
+                closed();
         }
         catch (Exception failure)
         {