tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1130817 - /tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
Date Thu, 02 Jun 2011 21:18:07 GMT
Author: markt
Date: Thu Jun  2 21:18:07 2011
New Revision: 1130817

URL: http://svn.apache.org/viewvc?rev=1130817&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51278
Changes required to original fix identified by TCK tests
Need to merge defaults before JSP->Servlet conversion since defaults define JSP servlet.

Modified:
    tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java

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=1130817&r1=1130816&r2=1130817&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Thu Jun  2 21:18:07 2011
@@ -1271,13 +1271,15 @@ public class ContextConfig
                     ok = webXml.merge(orderedFragments);
                 }
     
-                // Step 7. Convert explicitly mentioned jsps to servlets
+                // Step 7. Apply global defaults
+                // Have to merge defaults before JSP conversion since defaults
+                // provide JSP servlet definition.
+                webXml.merge(defaults);
+
+                // Step 8. Convert explicitly mentioned jsps to servlets
                 if (!false) {
                     convertJsps(webXml);
                 }
-
-                // Step 8. Apply global defaults
-                webXml.merge(defaults);
                 
                 // Step 9. Apply merged web.xml to Context
                 if (ok) {
@@ -1342,8 +1344,8 @@ public class ContextConfig
             }
         } else {
             // Apply unmerged web.xml to Context
-            convertJsps(webXml);
             webXml.merge(defaults);
+            convertJsps(webXml);
             webXml.configureContext(context);
         }
     }



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


Mime
View raw message