Issue #5032 - Don't wrap if there is no ServletContextHandler

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
jetty · Sep 15, 2020 · 439d3f9 · 439d3f9
1 parent 30caaba
commit 439d3f9
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
@@ -419,9 +419,13 @@ public void initialize()
     private Servlet wrap(final Servlet servlet)
     {
         Servlet ret = servlet;
-        for (ServletHolder.WrapperFunction wrapperFunction : getServletHandler().getServletContextHandler().getBeans(ServletHolder.WrapperFunction.class))
+        ServletContextHandler contextHandler = getServletHandler().getServletContextHandler();
+        if (contextHandler != null)
         {
-            ret = wrapperFunction.wrapServlet(ret);
+            for (ServletHolder.WrapperFunction wrapperFunction : getServletHandler().getServletContextHandler().getBeans(ServletHolder.WrapperFunction.class))
+            {
+                ret = wrapperFunction.wrapServlet(ret);
+            }
         }
         return ret;
     }