amyroh 02/04/16 13:27:37
Modified: catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java ServerLifecycleListener.java
Log:
Service parameter is required to find the right connector mbean to remove for
destroyMBean(connector). Temporarily connects the connector to its owning
service to get the right mbean name and disconnects.
Revision Changes Path
1.33 +7 -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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- MBeanUtils.java 9 Apr 2002 23:54:35 -0000 1.32
+++ MBeanUtils.java 16 Apr 2002 20:27:37 -0000 1.33
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.32 2002/04/09 23:54:35 amyroh Exp $
- * $Revision: 1.32 $
- * $Date: 2002/04/09 23:54:35 $
+ * $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 $
*
* ====================================================================
*
@@ -109,7 +109,7 @@
*
* @author Craig R. McClanahan
* @author Amy Roh
- * @version $Revision: 1.32 $ $Date: 2002/04/09 23:54:35 $
+ * @version $Revision: 1.33 $ $Date: 2002/04/16 20:27:37 $
*/
public class MBeanUtils {
@@ -1277,9 +1277,10 @@
*
* @exception Exception if an MBean cannot be deregistered
*/
- public static void destroyMBean(Connector connector)
+ public static void destroyMBean(Connector connector, Service service)
throws Exception {
+ connector.setService(service);
String mname = createManagedName(connector);
ManagedBean managed = registry.findManagedBean(mname);
if (managed == null) {
@@ -1289,6 +1290,7 @@
if (domain == null)
domain = mserver.getDefaultDomain();
ObjectName oname = createObjectName(domain, connector);
+ connector.setService(null);
mserver.unregisterMBean(oname);
}
1.22 +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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ServerLifecycleListener.java 6 Mar 2002 06:49:11 -0000 1.21
+++ ServerLifecycleListener.java 16 Apr 2002 20:27:37 -0000 1.22
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java,v
1.21 2002/03/06 06:49:11 craigmcc Exp $
- * $Revision: 1.21 $
- * $Date: 2002/03/06 06:49:11 $
+ * $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 $
*
* ====================================================================
*
@@ -107,7 +107,7 @@
*
* @author Craig R. McClanahan
* @author Amy Roh
- * @version $Revision: 1.21 $ $Date: 2002/03/06 06:49:11 $
+ * @version $Revision: 1.22 $ $Date: 2002/04/16 20:27:37 $
*/
public class ServerLifecycleListener
@@ -563,12 +563,12 @@
*
* @exception Exception if an exception is thrown during MBean creation
*/
- protected void destroyMBeans(Connector connector) throws Exception {
+ protected void destroyMBeans(Connector connector, Service service) throws
Exception {
// deregister the MBean for the Connector itself
if (debug >= 5)
log("Destroying MBean for Connector " + connector);
- MBeanUtils.destroyMBean(connector);
+ MBeanUtils.destroyMBean(connector, service);
}
@@ -764,7 +764,7 @@
// Deregister the MBeans for the corresponding Connectors
Connector connectors[] = service.findConnectors();
for (int j = 0; j < connectors.length; j++) {
- destroyMBeans(connectors[j]);
+ destroyMBeans(connectors[j], service);
}
// Deregister the MBeans for the associated Engine
@@ -1091,7 +1091,7 @@
}
if ("connector".equals(propertyName)) {
if (oldValue != null) {
- destroyMBeans((Connector) oldValue);
+ destroyMBeans((Connector) oldValue, service);
}
if (newValue != null) {
createMBeans((Connector) newValue);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
