Issue #4765 - Review GzipHandler inside ServletContextHandler.

Restored IncludedGzipTest. Fixed ServletContextHandler.relinkHandlers(), now excluding the checks for GzipHandler. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
jetty · Apr 14, 2020 · 509f579 · 509f579
1 parent 013acca
commit 509f579
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java
@@ -248,10 +248,8 @@ private void relinkHandlers()
         // link session handler
         if (getSessionHandler() != null)
         {
-
             while (!(handler.getHandler() instanceof SessionHandler) &&
                 !(handler.getHandler() instanceof SecurityHandler) &&
-                !(handler.getHandler() instanceof GzipHandler) &&
                 !(handler.getHandler() instanceof ServletHandler) &&
                 handler.getHandler() instanceof HandlerWrapper)
             {
@@ -267,7 +265,6 @@ private void relinkHandlers()
         if (getSecurityHandler() != null)
         {
             while (!(handler.getHandler() instanceof SecurityHandler) &&
-                !(handler.getHandler() instanceof GzipHandler) &&
                 !(handler.getHandler() instanceof ServletHandler) &&
                 handler.getHandler() instanceof HandlerWrapper)
             {

diff --git a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/IncludedGzipTest.java b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/IncludedGzipTest.java
@@ -90,7 +90,7 @@ public void setUp() throws Exception
 
         GzipHandler gzipHandler = new GzipHandler();
         gzipHandler.setMinGzipSize(16);
-        tester.getServer().insertHandler(gzipHandler);
+        tester.getContext().insertHandler(gzipHandler);
         tester.start();
     }