remm 2003/08/29 16:05:50
Modified: catalina/src/share/org/apache/catalina/loader
WebappClassLoader.java
Log:
- Release all logs associated with this CL when stopping the CL.
- Avoid NPE in toString after stop.
Revision Changes Path
1.20 +10 -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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- WebappClassLoader.java 17 Aug 2003 08:36:14 -0000 1.19
+++ WebappClassLoader.java 29 Aug 2003 23:05:50 -0000 1.20
@@ -834,10 +834,12 @@
sb.append(delegate);
sb.append("\r\n");
sb.append(" repositories:\r\n");
- for (int i = 0; i < repositories.length; i++) {
- sb.append(" ");
- sb.append(repositories[i]);
- sb.append("\r\n");
+ if (repositories != null) {
+ for (int i = 0; i < repositories.length; i++) {
+ sb.append(" ");
+ sb.append(repositories[i]);
+ sb.append("\r\n");
+ }
}
if (this.parent != null) {
sb.append("----------> Parent Classloader:\r\n");
@@ -1520,6 +1522,7 @@
lastModifiedDates = null;
paths = null;
hasExternalRepositories = false;
+ parent = null;
permissionList.clear();
loaderPC.clear();
@@ -1527,6 +1530,8 @@
if (loaderDir != null) {
deleteDir(loaderDir);
}
+
+ org.apache.commons.logging.LogFactory.release(this);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
