remm 2003/06/15 00:41:12
Modified: catalina/src/share/org/apache/catalina/startup
ContextConfig.java TldConfig.java
Log:
- Address bug 20758.
- Cleanup digester after processing.
Revision Changes Path
1.27 +3 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
Index: ContextConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ContextConfig.java 6 Jun 2003 02:46:41 -0000 1.26
+++ ContextConfig.java 15 Jun 2003 07:41:12 -0000 1.27
@@ -309,14 +309,11 @@
if( url!=null ) {
InputSource is = new InputSource(url.toExternalForm());
is.setByteStream(stream);
+ webDigester.clear();
webDigester.setDebug(getDebug());
if (context instanceof StandardContext) {
((StandardContext) context).setReplaceWelcomeFiles(true);
}
- webDigester.clear();
-// ClassLoader cl=Thread.currentThread().getContextClassLoader();
-// if( cl!=null )
-// webDigester.setClassLoader(cl);
webDigester.setUseContextClassLoader(true);
webDigester.push(context);
webDigester.parse(is);
@@ -340,6 +337,7 @@
} catch (IOException e) {
log.error(sm.getString("contextConfig.applicationClose"), e);
}
+ webDigester.push(null);
}
}
webRuleSet.recycle();
1.12 +7 -3
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/TldConfig.java
Index: TldConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/TldConfig.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- TldConfig.java 12 Jun 2003 22:41:19 -0000 1.11
+++ TldConfig.java 15 Jun 2003 07:41:12 -0000 1.12
@@ -533,9 +533,13 @@
}
synchronized (tldDigester) {
- tldDigester.clear();
- tldDigester.push(this);
- tldDigester.parse(resourceStream);
+ try {
+ tldDigester.push(this);
+ tldDigester.parse(resourceStream);
+ } finally {
+ tldDigester.push(null);
+ tldDigester.clear();
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
