Fix FindBugs identified error in Servlet 2.2 jspFile handling

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

diff --git a/java/org/apache/catalina/startup/ContextConfig.java b/java/org/apache/catalina/startup/ContextConfig.java
index 65e3387..ee56360 100644 (file)
--- a/java/org/apache/catalina/startup/ContextConfig.java
+++ b/java/org/apache/catalina/startup/ContextConfig.java
@@ -1337,7 +1337,6 @@ public class ContextConfig
     private void convertJsp(ServletDef servletDef, ServletDef jspServletDef) {
         servletDef.setServletClass(org.apache.catalina.core.Constants.JSP_SERVLET_CLASS);
         String jspFile = servletDef.getJspFile();
-        servletDef.getParameterMap().put("jspFile", jspFile);
         if ((jspFile != null) && !jspFile.startsWith("/")) {
             if (context.isServlet22()) {
                 if(log.isDebugEnabled())
@@ -1349,6 +1348,7 @@ public class ContextConfig
                     (sm.getString("contextConfig.jspFile.error", jspFile));
             }
         }
+        servletDef.getParameterMap().put("jspFile", jspFile);
         servletDef.setJspFile(null);
         for (Map.Entry<String, String> initParam: jspServletDef.getParameterMap().entrySet()) {
             servletDef.addInitParameter(initParam.getKey(), initParam.getValue());

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f4430f9..250ef0f 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -151,6 +151,10 @@
         Ensure a web application is taken out of service if the web.xml file is
         not valid. (kkolinko/markt)
       </fix>
+      <fix>
+        Ensure Servlet 2.2 jspFile elements are correctly converted to use a
+        leading &apos;/&apos; if missing. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">