fixed bad merge

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-12-04 15:32:28 +11:00 · 2019-12-04 15:32:28 +11:00 · c6633e8d67
parent 806953f1b5
commit c6633e8d67
2 changed files with 4 additions and 0 deletions
--- a/jetty-http2/http2-server/src/main/java/module-info.java
+++ b/jetty-http2/http2-server/src/main/java/module-info.java
@ -25,4 +25,6 @@ module org.eclipse.jetty.http2.server
    requires org.eclipse.jetty.io;
    requires org.eclipse.jetty.server;
    requires org.eclipse.jetty.util;
+
+    requires jetty.servlet.api;
 }
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
@ -482,6 +482,8 @@ public class HttpOutput extends ServletOutputStream implements Runnable
        {
            write(content, complete, blocker);
            blocker.block();
+            if (complete)
+                closed();
        }
        catch (Exception failure)
        {