remm 2002/09/05 04:38:59
Modified: catalina/src/share/org/apache/catalina/loader
WebappClassLoader.java
Log:
- Port patch.
- Fix bug where external repositories were not used.
Patch submitted by David Oxley <dave at staffplanner.co.uk>
- getURL returned invalid URLs. Unfortunately, fixing this will break the security
manager under Windows using the default policy file. The workaround is easy,
as the entries should be modified from:
grant codeBase "file:${catalina.home}/server/webapps/admin/WEB-INF/lib/struts.jar"
to
grant codeBase"file:/${catalina.home}/server/webapps/admin/WEB-INF/lib/struts.jar"
(note the extra '/')
- It will be mentioned in the release notes.
Revision Changes Path
1.6 +9 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
Index: WebappClassLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WebappClassLoader.java 24 Aug 2002 02:27:27 -0000 1.5
+++ WebappClassLoader.java 5 Sep 2002 11:38:59 -0000 1.6
@@ -835,6 +835,10 @@
log(" findClassInternal(" + name + ")");
try {
clazz = findClassInternal(name);
+ } catch(ClassNotFoundException cnfe) {
+ if (!hasExternalRepositories) {
+ throw cnfe;
+ }
} catch(AccessControlException ace) {
ace.printStackTrace();
throw new ClassNotFoundException(name);
@@ -1923,7 +1927,7 @@
} catch (IOException e) {
// Ignore
}
- return new URL("file:" + realFile.getPath());
+ return realFile.toURL();
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
