From: markt Date: Thu, 13 May 2010 21:17:44 +0000 (+0000) Subject: Fix copy/paste error X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=e468bea1bd24ff2cc3b83a1c1de4357bbf82d862;p=tomcat7.0 Fix copy/paste error Add whitespace to aid readability git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@944018 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/java/org/apache/catalina/startup/ContextConfig.java b/java/org/apache/catalina/startup/ContextConfig.java index 138b32e3d..1c6c6af81 100644 --- a/java/org/apache/catalina/startup/ContextConfig.java +++ b/java/org/apache/catalina/startup/ContextConfig.java @@ -482,6 +482,7 @@ public class ContextConfig } webDigester = webDigesters[1]; webFragmentDigester = webFragmentDigesters[1]; + } else if (namespaceAware && !validation) { if (webDigesters[2] == null) { webDigesters[2] = DigesterFactory.newDigester(validation, @@ -491,12 +492,13 @@ public class ContextConfig } webDigester = webDigesters[2]; webFragmentDigester = webFragmentDigesters[2]; + } else { if (webDigesters[3] == null) { webDigesters[3] = DigesterFactory.newDigester(validation, - namespaceAware, webFragmentRuleSet); - webFragmentDigesters[3] = DigesterFactory.newDigester(validation, namespaceAware, webRuleSet); + webFragmentDigesters[3] = DigesterFactory.newDigester(validation, + namespaceAware, webFragmentRuleSet); } webDigester = webDigesters[3]; webFragmentDigester = webFragmentDigesters[3];