You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2011/06/23 11:00:52 UTC
svn commit: r1138776 -
/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
Author: markt
Date: Thu Jun 23 09:00:51 2011
New Revision: 1138776
URL: http://svn.apache.org/viewvc?rev=1138776&view=rev
Log:
Revert r1137753 - I have a better soution in mind
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=1138776&r1=1138775&r2=1138776&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Thu Jun 23 09:00:51 2011
@@ -229,32 +229,6 @@ public class ContextConfig
new LoginConfig("NONE", null, null, null);
- static {
- webDigesters[0] = DigesterFactory.newDigester(false, false, webRuleSet);
- webDigesters[0].getParser();
- webFragmentDigesters[0] = DigesterFactory.newDigester(false, false,
- webFragmentRuleSet);
- webFragmentDigesters[0].getParser();
-
- webDigesters[1] = DigesterFactory.newDigester(true, false, webRuleSet);
- webDigesters[1].getParser();
- webFragmentDigesters[1] = DigesterFactory.newDigester(true, false,
- webFragmentRuleSet);
- webFragmentDigesters[1].getParser();
-
- webDigesters[2] = DigesterFactory.newDigester(false, true, webRuleSet);
- webDigesters[2].getParser();
- webFragmentDigesters[2] = DigesterFactory.newDigester(false, true,
- webFragmentRuleSet);
- webFragmentDigesters[2].getParser();
-
- webDigesters[3] = DigesterFactory.newDigester(true, true, webRuleSet);
- webDigesters[3].getParser();
- webFragmentDigesters[3] = DigesterFactory.newDigester(true, true,
- webFragmentRuleSet);
- webFragmentDigesters[3].getParser();
- }
-
// ------------------------------------------------------------- Properties
@@ -501,22 +475,46 @@ public class ContextConfig
* Create (if necessary) and return a Digester configured to process the
* web application deployment descriptor (web.xml).
*/
- protected void createWebXmlDigester(boolean namespaceAware,
+ public void createWebXmlDigester(boolean namespaceAware,
boolean validation) {
if (!namespaceAware && !validation) {
+ if (webDigesters[0] == null) {
+ webDigesters[0] = DigesterFactory.newDigester(validation,
+ namespaceAware, webRuleSet);
+ webFragmentDigesters[0] = DigesterFactory.newDigester(validation,
+ namespaceAware, webFragmentRuleSet);
+ }
webDigester = webDigesters[0];
webFragmentDigester = webFragmentDigesters[0];
} else if (!namespaceAware && validation) {
+ if (webDigesters[1] == null) {
+ webDigesters[1] = DigesterFactory.newDigester(validation,
+ namespaceAware, webRuleSet);
+ webFragmentDigesters[1] = DigesterFactory.newDigester(validation,
+ namespaceAware, webFragmentRuleSet);
+ }
webDigester = webDigesters[1];
webFragmentDigester = webFragmentDigesters[1];
} else if (namespaceAware && !validation) {
+ if (webDigesters[2] == null) {
+ webDigesters[2] = DigesterFactory.newDigester(validation,
+ namespaceAware, webRuleSet);
+ webFragmentDigesters[2] = DigesterFactory.newDigester(validation,
+ namespaceAware, webFragmentRuleSet);
+ }
webDigester = webDigesters[2];
webFragmentDigester = webFragmentDigesters[2];
} else {
+ if (webDigesters[3] == null) {
+ webDigesters[3] = DigesterFactory.newDigester(validation,
+ namespaceAware, webRuleSet);
+ webFragmentDigesters[3] = DigesterFactory.newDigester(validation,
+ namespaceAware, webFragmentRuleSet);
+ }
webDigester = webDigesters[3];
webFragmentDigester = webFragmentDigesters[3];
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org