amyroh 2003/05/27 16:15:06
Modified: catalina/src/share/org/apache/catalina/loader
mbeans-descriptors.xml
catalina/src/share/org/apache/catalina/session
mbeans-descriptors.xml
catalina/src/share/org/apache/naming ContextBindings.java
Log:
Remove checkInterval since it no longer exists. Also, check for NPE in
unblindClassLoader. It was thorwing NPE when newly added context was removed.
Revision Changes Path
1.2 +1 -6
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/mbeans-descriptors.xml
Index: mbeans-descriptors.xml
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/mbeans-descriptors.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mbeans-descriptors.xml 25 Apr 2003 21:14:35 -0000 1.1
+++ mbeans-descriptors.xml 27 May 2003 23:15:06 -0000 1.2
@@ -7,12 +7,7 @@
domain="Catalina"
group="Loader"
type="org.apache.catalina.loader.WebappLoader">
-
- <attribute name="checkInterval"
- description="The number of seconds between checks for modified
- classes"
- type="int"/>
-
+
<attribute name="className"
description="Fully qualified class name of the managed object"
type="java.lang.String"
1.2 +0 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/mbeans-descriptors.xml
Index: mbeans-descriptors.xml
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/mbeans-descriptors.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mbeans-descriptors.xml 25 Apr 2003 21:14:36 -0000 1.1
+++ mbeans-descriptors.xml 27 May 2003 23:15:06 -0000 1.2
@@ -17,11 +17,6 @@
description="File source of random - /dev/urandom or a pipe"
type="java.lang.String"/>
- <attribute name="checkInterval"
- description="The interval (in seconds) between checks for expired
- sessions"
- type="int"/>
-
<attribute name="className"
description="Fully qualified class name of the managed object"
type="java.lang.String"
1.2 +5 -6
jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/ContextBindings.java
Index: ContextBindings.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/ContextBindings.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ContextBindings.java 18 Jul 2002 16:47:31 -0000 1.1
+++ ContextBindings.java 27 May 2003 23:15:06 -0000 1.2
@@ -347,7 +347,7 @@
ClassLoader classLoader) {
if (ContextAccessController.checkSecurityToken(name, token)) {
Object n = clNameBindings.get(classLoader);
- if (!(n.equals(name))) {
+ if ((n==null) || !(n.equals(name))) {
return;
}
clBindings.remove(classLoader);
@@ -407,4 +407,3 @@
}
-
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
