markt 2004/09/05 11:43:08
Modified: catalina/src/share/org/apache/catalina/core
NamingContextListener.java
Log:
Part of fix for bug 20758. Add missing call to unbindContext()
Also removed unused imports identified by Eclipse
Revision Changes Path
1.23 +3 -14
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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- NamingContextListener.java 26 Aug 2004 21:31:21 -0000 1.22
+++ NamingContextListener.java 5 Sep 2004 18:43:08 -0000 1.23
@@ -20,24 +20,12 @@
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.TreeMap;
import java.util.Hashtable;
-import java.util.Stack;
import java.util.Enumeration;
import java.util.StringTokenizer;
import javax.naming.NamingException;
-import javax.naming.InitialContext;
import javax.naming.Reference;
import javax.naming.StringRefAddr;
-import javax.naming.NamingEnumeration;
-import javax.naming.Binding;
-import javax.naming.StringRefAddr;
-import javax.naming.directory.DirContext;
import org.apache.naming.NamingContext;
import org.apache.naming.ContextBindings;
import org.apache.naming.ContextAccessController;
@@ -52,7 +40,6 @@
import org.apache.catalina.Context;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleEvent;
-import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.Logger;
import org.apache.catalina.Server;
@@ -285,6 +272,8 @@
// Setting the context in read/write mode
ContextAccessController.setWritable(getName(), container);
+
+ ContextBindings.unbindContext(container, container);
if (container instanceof Context) {
ContextBindings.unbindClassLoader
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
