amyroh 02/04/17 17:13:07
Modified: catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java ServerLifecycleListener.java
Log:
Add container parameter to destroyMBean(valve, container) to find the right
valve mbean after removeValve() is called. Need its previously owning
container info to unregister the correct mbean for a valve.
Revision Changes Path
1.34 +12 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- MBeanUtils.java 16 Apr 2002 20:27:37 -0000 1.33
+++ MBeanUtils.java 18 Apr 2002 00:13:07 -0000 1.34
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.33 2002/04/16 20:27:37 amyroh Exp $
- * $Revision: 1.33 $
- * $Date: 2002/04/16 20:27:37 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.34 2002/04/18 00:13:07 amyroh Exp $
+ * $Revision: 1.34 $
+ * $Date: 2002/04/18 00:13:07 $
*
* ====================================================================
*
@@ -77,6 +77,7 @@
import javax.management.modelmbean.InvalidTargetObjectTypeException;
import javax.management.modelmbean.ModelMBean;
import org.apache.catalina.Connector;
+import org.apache.catalina.Contained;
import org.apache.catalina.Container;
import org.apache.catalina.Context;
import org.apache.catalina.DefaultContext;
@@ -109,7 +110,7 @@
*
* @author Craig R. McClanahan
* @author Amy Roh
- * @version $Revision: 1.33 $ $Date: 2002/04/16 20:27:37 $
+ * @version $Revision: 1.34 $ $Date: 2002/04/18 00:13:07 $
*/
public class MBeanUtils {
@@ -1653,9 +1654,10 @@
*
* @exception Exception if an MBean cannot be deregistered
*/
- public static void destroyMBean(Valve valve)
+ public static void destroyMBean(Valve valve, Container container)
throws Exception {
+ ((Contained)valve).setContainer(container);
String mname = createManagedName(valve);
ManagedBean managed = registry.findManagedBean(mname);
if (managed == null) {
@@ -1665,6 +1667,11 @@
if (domain == null)
domain = mserver.getDefaultDomain();
ObjectName oname = createObjectName(domain, valve);
+ try {
+ ((Contained)valve).setContainer(null);
+ } catch (Throwable t) {
+ ;
+ }
mserver.unregisterMBean(oname);
}
1.23 +8 -8
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java
Index: ServerLifecycleListener.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ServerLifecycleListener.java 16 Apr 2002 20:27:37 -0000 1.22
+++ ServerLifecycleListener.java 18 Apr 2002 00:13:07 -0000 1.23
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java,v
1.22 2002/04/16 20:27:37 amyroh Exp $
- * $Revision: 1.22 $
- * $Date: 2002/04/16 20:27:37 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java,v
1.23 2002/04/18 00:13:07 amyroh Exp $
+ * $Revision: 1.23 $
+ * $Date: 2002/04/18 00:13:07 $
*
* ====================================================================
*
@@ -107,7 +107,7 @@
*
* @author Craig R. McClanahan
* @author Amy Roh
- * @version $Revision: 1.22 $ $Date: 2002/04/16 20:27:37 $
+ * @version $Revision: 1.23 $ $Date: 2002/04/18 00:13:07 $
*/
public class ServerLifecycleListener
@@ -626,7 +626,7 @@
for (int l = 0; l < cValves.length; l++) {
if (debug >= 4)
log("Destroying MBean for Valve " + cValves[l]);
- MBeanUtils.destroyMBean(cValves[l]);
+ MBeanUtils.destroyMBean(cValves[l], context);
}
}
@@ -673,7 +673,7 @@
for (int k = 0; k < eValves.length; k++) {
if (debug >= 3)
log("Destroying MBean for Valve " + eValves[k]);
- MBeanUtils.destroyMBean(eValves[k]);
+ MBeanUtils.destroyMBean(eValves[k], engine);
}
}
@@ -726,7 +726,7 @@
for (int k = 0; k < hValves.length; k++) {
if (debug >= 3)
log("Destroying MBean for Valve " + hValves[k]);
- MBeanUtils.destroyMBean(hValves[k]);
+ MBeanUtils.destroyMBean(hValves[k], host);
}
}
@@ -1020,7 +1020,7 @@
valve + "]");
try {
- MBeanUtils.destroyMBean(valve);
+ MBeanUtils.destroyMBean(valve, container);
} catch (MBeanException t) {
Exception e = t.getTargetException();
if (e == null)
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
