Author: markt
Date: Mon Sep 21 22:03:27 2009
New Revision: 817434
URL: http://svn.apache.org/viewvc?rev=817434&view=rev
Log:
Don't mark every servlet as the JSP Servlet
Modified:
tomcat/trunk/java/org/apache/catalina/startup/WebXml.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/WebXml.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/WebXml.java?rev=817434&r1=817433&r2=817434&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/WebXml.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/WebXml.java Mon Sep 21
22:03:27 2009
@@ -494,7 +494,12 @@
// Description is ignored
// Display name is ignored
// Icons are ignored
- wrapper.setJspFile(servlet.getJspFile());
+ // Only set this if it is non-null else every servlet will get
+ // marked as the JSP servlet
+ String jspFile = servlet.getJspFile();
+ if (jspFile != null) {
+ wrapper.setJspFile(jspFile);
+ }
if (servlet.getLoadOnStartup() != null) {
wrapper.setLoadOnStartup(servlet.getLoadOnStartup().intValue());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
