Issue #9925 Use current ServletContextHandler (#9933)

jetty · Jun 20, 2023 · a5f26b3 · a5f26b3
1 parent 87eb651
commit a5f26b3
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/...etty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletContextHandler.java b/...etty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletContextHandler.java
@@ -164,7 +164,8 @@ public static ServletContextHandler getServletContextHandler(ServletContext serv
     {
         if (servletContext instanceof ServletContextApi)
             return ((ServletContextApi)servletContext).getContext().getServletContextHandler();
-        return null;
+
+        return getCurrentServletContextHandler();
     }
 
     public static ServletContext getCurrentServletContext()