luehe 2003/09/22 16:56:11
Modified: catalina/src/share/org/apache/catalina/startup
TldConfig.java
Log:
Do not let the parsing error of a single TLD disrupt the parsing of remaining TLDs
in the JAR
Revision Changes Path
1.23 +10 -14
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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- TldConfig.java 22 Sep 2003 22:25:20 -0000 1.22
+++ TldConfig.java 22 Sep 2003 23:56:11 -0000 1.23
@@ -503,7 +503,6 @@
JarFile jarFile = null;
String name = null;
- InputSource inputSource = null;
String jarPath = file.getAbsolutePath();
@@ -522,21 +521,18 @@
if (log.isTraceEnabled()) {
log.trace(" Processing TLD at '" + name + "'");
}
- inputSource = new InputSource(jarFile.getInputStream(entry));
- tldScanStream(inputSource);
- inputSource = null;
- name = null;
+ try {
+ tldScanStream(new InputSource(jarFile.getInputStream(entry)));
+ } catch (Exception e) {
+ log.error(sm.getString("contextConfig.tldEntryException",
+ name, jarPath, context.getPath()),
+ e);
+ }
}
} catch (Exception e) {
- if (name == null) {
- log.error(sm.getString("contextConfig.tldJarException",
- jarPath, context.getPath()),
- e);
- } else {
- log.error(sm.getString("contextConfig.tldEntryException",
- name, jarPath, context.getPath()),
- e);
- }
+ log.error(sm.getString("contextConfig.tldJarException",
+ jarPath, context.getPath()),
+ e);
} finally {
if (jarFile != null) {
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
