From 8243ed4d4d3c01c1310d280c54cef392d5bf934b Mon Sep 17 00:00:00 2001 From: markt Date: Thu, 2 Jun 2011 21:18:07 +0000 Subject: [PATCH] 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. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1130817 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/startup/ContextConfig.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/java/org/apache/catalina/startup/ContextConfig.java b/java/org/apache/catalina/startup/ContextConfig.java index dba237b57..3bf5fffb1 100644 --- a/java/org/apache/catalina/startup/ContextConfig.java +++ b/java/org/apache/catalina/startup/ContextConfig.java @@ -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); } } -- 2.11.0