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

460176 When checking for precompiled jsp, ensure classname is present

This commit is contained in:
Jan Bartel 2015-02-18 11:05:54 +11:00
parent ce5db2ca55
commit 6097123af6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,9 +70,9 @@ import org.eclipse.jetty.util.log.Logger;
@ManagedObject("Servlet Holder") @ManagedObject("Servlet Holder")
public class ServletHolder extends Holder<Servlet> implements UserIdentity.Scope, Comparable<ServletHolder> public class ServletHolder extends Holder<Servlet> implements UserIdentity.Scope, Comparable<ServletHolder>
{ {
private static final Logger LOG = Log.getLogger(ServletHolder.class);
/* ---------------------------------------------------------------- */ /* ---------------------------------------------------------------- */
private static final Logger LOG = Log.getLogger(ServletHolder.class);
private int _initOrder = -1; private int _initOrder = -1;
private boolean _initOnStartup=false; private boolean _initOnStartup=false;
private Map<String, String> _roleMap; private Map<String, String> _roleMap;
@ -297,7 +297,7 @@ public class ServletHolder extends Holder<Servlet> implements UserIdentity.Scope
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())
LOG.debug("Checking for precompiled servlet {} for jsp {}", precompiled, _forcedPath); LOG.debug("Checking for precompiled servlet {} for jsp {}", precompiled, _forcedPath);
ServletHolder jsp=getServletHandler().getServlet(precompiled); ServletHolder jsp=getServletHandler().getServlet(precompiled);
if (jsp!=null) if (jsp!=null && jsp.getClassName() != null)
{ {
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())
LOG.debug("JSP file {} for {} mapped to Servlet {}",_forcedPath, getName(),jsp.getClassName()); LOG.debug("JSP file {} for {} mapped to Servlet {}",_forcedPath, getName(),jsp.getClassName());