Author: markt
Date: Thu May 13 21:17:44 2010
New Revision: 944018
URL: http://svn.apache.org/viewvc?rev=944018&view=rev
Log:
Fix copy/paste error
Add whitespace to aid readability
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=944018&r1=944017&r2=944018&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Thu May 13
21:17:44 2010
@@ -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];
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
