luehe 2003/03/28 12:56:16
Modified: catalina/src/share/org/apache/catalina/startup
TldConfig.java
Log:
Changed timing of setUseCaches call on JarURLConnection, to prevent
java.lang.IllegalStateException
Revision Changes Path
1.4 +8 -4
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TldConfig.java 26 Mar 2003 20:40:37 -0000 1.3
+++ TldConfig.java 28 Mar 2003 20:56:15 -0000 1.4
@@ -444,7 +444,9 @@
resourcePath));
}
url = new URL("jar:" + url.toString() + "!/");
- tldScanJar((JarURLConnection) url.openConnection());
+ JarURLConnection conn = (JarURLConnection) url.openConnection();
+ conn.setUseCaches(false);
+ tldScanJar(conn);
}
/*
@@ -462,7 +464,6 @@
String jarPath = conn.getJarFileURL().toString();
try {
- conn.setUseCaches(false);
jarFile = conn.getJarFile();
Enumeration entries = jarFile.entries();
while (entries.hasMoreElements()) {
@@ -725,14 +726,17 @@
for (int i=0; i<urls.length; i++) {
URLConnection conn = urls[i].openConnection();
if (conn instanceof JarURLConnection) {
+ conn.setUseCaches(false);
globalJarPaths.add((JarURLConnection) conn);
} else {
String urlStr = urls[i].toString();
if (urlStr.startsWith("file:")
&& urlStr.endsWith(".jar")) {
URL jarURL = new URL("jar:" + urlStr + "!/");
- globalJarPaths.add((JarURLConnection)
- jarURL.openConnection());
+ JarURLConnection jarConn = (JarURLConnection)
+ jarURL.openConnection();
+ jarConn.setUseCaches(false);
+ globalJarPaths.add(jarConn);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
