Issue #9925 Also use current context for alternate getServletContextH…

…andler method
jetty · Jun 21, 2023 · c8cb4cb · c8cb4cb
1 parent b5360f3
commit c8cb4cb
Showing 1 changed file with 3 additions and 0 deletions.
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
@@ -157,6 +157,9 @@ public static ServletContextHandler getServletContextHandler(ServletContext serv
     {
         if (servletContext instanceof ServletContextApi servletContextApi)
             return servletContextApi.getContext().getServletContextHandler();
+        ServletContextHandler sch = getCurrentServletContextHandler();
+        if (sch != null)
+            return sch;
         throw new IllegalStateException("No Jetty ServletContextHandler, " + purpose + " unavailable");
     }