Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x-ewyk

2017-03-30 17:28:00 +11:00 · 2017-03-30 17:28:00 +11:00 · 8159c508f0
parent 5805a92d0e daf61cd294
commit 8159c508f0
1 changed files with 5 additions and 1 deletions
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java
@ -561,10 +561,14 @@ public class GzipHandler extends HandlerWrapper implements GzipFactory
    @Override
    public void recycle(Deflater deflater)
    {
-        deflater.reset();
        if (_deflater.get()==null)
+        {
+            deflater.reset();
            _deflater.set(deflater);
        }
+        else
+            deflater.end();
+    }

    /**
     * @param checkGzExists whether to check if a static gz file exists for