Revert "Issue #4824 - Addressing flush/commit with GzipHttpOutputInte…

…rceptor" This reverts commit a21e833 Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
jetty · May 1, 2020 · 3e6f5e4 · 3e6f5e4
1 parent a21e833
commit 3e6f5e4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 167 deletions.
diff --git a/...server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHttpOutputInterceptor.java b/...server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHttpOutputInterceptor.java
@@ -229,15 +229,7 @@ protected void commit(ByteBuffer content, boolean complete, Callback callback)
             LOG.debug("{} compressing {}", this, _deflater);
             _state.set(GZState.COMPRESSING);
 
-            if (content.remaining() == 0)
-            {
-                // We are committing, and we have no content to compress.
-                _interceptor.write(content, complete, callback);
-            }
-            else
-            {
-                gzip(content, complete, callback);
-            }
+            gzip(content, complete, callback);
         }
         else
             callback.failed(new WritePendingException());
@@ -420,7 +412,7 @@ protected Action process() throws Exception
         @Override
         public String toString()
         {
-            return String.format("%s[content=%s last=%b copy=%s buffer=%s deflate=%s %s]",
+            return String.format("%s[content=%s last=%b copy=%s buffer=%s deflate=%s",
                 super.toString(),
                 BufferUtil.toDetailString(_content),
                 _last,

diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/GzipHandlerCommitTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/GzipHandlerCommitTest.java