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-7' into jetty-8

This commit is contained in:
Jan Bartel 2013-08-16 11:06:42 +10:00
parent 6a22a9f5b9 54a899d55f
commit 1691618024
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java
View File

@ -329,7 +329,9 @@ public class StandardDescriptorProcessor extends IterativeDescriptorProcessor
if (jsp_file != null) if (jsp_file != null)
{ {
holder.setForcedPath(jsp_file); holder.setForcedPath(jsp_file);
holder.setClassName(jspServletClass); //only use our default instance ServletHolder jsp=context.getServletHandler().getServlet("jsp");
if (jsp!=null)
holder.setClassName(jsp.getClassName());
} }
// handle load-on-startup // handle load-on-startup