Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-12.0.x-fix-jspinit' into jetty-12.0.x

This commit is contained in:
Jan Bartel 2022-06-02 13:03:29 +10:00
parent b4e59bc4a7 ca2fc17e5c
commit d9dafa08f0
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletHolder.java
View File

@ -648,19 +648,12 @@ public class ServletHolder extends Holder<Servlet> implements Comparable<Servlet
}
}
private ContextHandler getContextHandler(ServletContext servletContext)
{
if (servletContext instanceof ContextHandler.Context)
return ((ContextHandler.Context)servletContext).getContextHandler();
return null;
}
/**
* @throws Exception if unable to init the JSP Servlet
*/
protected void initJspServlet() throws Exception
{
ContextHandler ch = getContextHandler(getServletHandler().getServletContext());
ContextHandler ch = getServletHandler().getServletContextHandler();
if (ch == null)
throw new IllegalStateException();
String classpath = ""; //ch.getClassPath(); todo: fix this