markt 2004/02/10 15:13:36
Modified: catalina/src/share/org/apache/catalina/core
StandardDefaultContext.java
Log:
Prevent mbean exceptions during startup if default context is defined with loader
and/or manager. Part of fix for bug 14193.
Revision Changes Path
1.12 +13 -10
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardDefaultContext.java
Index: StandardDefaultContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardDefaultContext.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- StandardDefaultContext.java 27 Oct 2003 07:39:19 -0000 1.11
+++ StandardDefaultContext.java 10 Feb 2004 23:13:36 -0000 1.12
@@ -70,22 +70,17 @@
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Hashtable;
-import java.util.Iterator;
import java.util.Vector;
import javax.naming.directory.DirContext;
import org.apache.naming.ContextAccessController;
import org.apache.catalina.Container;
-import org.apache.catalina.ContainerListener;
import org.apache.catalina.Context;
import org.apache.catalina.DefaultContext;
-import org.apache.catalina.InstanceListener;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleEvent;
-import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.Loader;
import org.apache.catalina.Manager;
-import org.apache.catalina.Wrapper;
import org.apache.catalina.deploy.ApplicationParameter;
import org.apache.catalina.deploy.ContextEjb;
import org.apache.catalina.deploy.ContextEnvironment;
@@ -469,6 +464,10 @@
Loader oldLoader = this.loader;
this.loader = loader;
+ if (loader != null) {
+ loader.setDefaultContext(this);
+ }
+
// Report this property change to interested listeners
support.firePropertyChange("loader", oldLoader, this.loader);
}
@@ -493,7 +492,11 @@
public void setManager(Manager manager) {
Manager oldManager = this.manager;
this.manager = manager;
-
+
+ if (manager != null) {
+ manager.setDefaultContext(this);
+ }
+
// Report this property change to interested listeners
support.firePropertyChange("manager", oldManager, this.manager);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
