Don't mark every servlet as the JSP Servlet

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@817434 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/startup/WebXml.java b/java/org/apache/catalina/startup/WebXml.java
index 0b28568..1fb6b0b 100644 (file)
--- a/java/org/apache/catalina/startup/WebXml.java
+++ b/java/org/apache/catalina/startup/WebXml.java
@@ -494,7 +494,12 @@ public class WebXml {
             // 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());
             }