From 439d3f9d9e56339ad3b1d8c0bb6580a1b14fa880 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Tue, 15 Sep 2020 16:08:18 -0500 Subject: [PATCH] Issue #5032 - Don't wrap if there is no ServletContextHandler Signed-off-by: Joakim Erdfelt --- .../java/org/eclipse/jetty/servlet/ServletHolder.java | 8 ++++++-- 1 file changed, 6 insertions(+), 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 index cf48c2d376c1..4f1599f7cc98 100644 --- 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; }