remm 02/04/15 17:43:04
Modified: catalina/src/share/org/apache/catalina/core
NamingContextListener.java
Log:
- Explicitely specify the classloader on unbind.
Revision Changes Path
1.11 +15 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/NamingContextListener.java
Index: NamingContextListener.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/NamingContextListener.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- NamingContextListener.java 9 Mar 2002 19:23:00 -0000 1.10
+++ NamingContextListener.java 16 Apr 2002 00:43:04 -0000 1.11
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/NamingContextListener.java,v
1.10 2002/03/09 19:23:00 remm Exp $
- * $Revision: 1.10 $
- * $Date: 2002/03/09 19:23:00 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/NamingContextListener.java,v
1.11 2002/04/16 00:43:04 remm Exp $
+ * $Revision: 1.11 $
+ * $Date: 2002/04/16 00:43:04 $
*
* ====================================================================
*
@@ -116,7 +116,7 @@
* with each context and server.
*
* @author Remy Maucherat
- * @version $Revision: 1.10 $ $Date: 2002/03/09 19:23:00 $
+ * @version $Revision: 1.11 $ $Date: 2002/04/16 00:43:04 $
*/
public class NamingContextListener
@@ -330,7 +330,17 @@
// Setting the context in read/write mode
ContextAccessController.setWritable(getName(), container);
- ContextBindings.unbindClassLoader(container, container);
+ if (container instanceof Context) {
+ ContextBindings.unbindClassLoader
+ (container, container,
+ ((Container) container).getLoader().getClassLoader());
+ }
+
+ if (container instanceof Server) {
+ ContextBindings.unbindClassLoader
+ (container, container,
+ this.getClass().getClassLoader());
+ }
ContextAccessController.unsetSecurityToken(getName(), container);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
