svn commit: r1074919 - in /tomcat/trunk: java/org/apache/catalina/startup/ContextConfig.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Sat Feb 26 20:44:34 2011
New Revision: 1074919

URL: http://svn.apache.org/viewvc?rev=1074919&view=rev
Log:
Fix FindBugs identified error in Servlet 2.2 jspFile handling

Modified:
    tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1074919&r1=1074918&r2=1074919&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Sat Feb 26 
20:44:34 2011
@@ -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());

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1074919&r1=1074918&r2=1074919&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sat Feb 26 20:44:34 2011
@@ -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">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org