[jboss-cvs] JBossAS SVN: r69649 - trunk/system-jmx/src/main/org/jboss/system/microcontainer/jmx.

[jboss-cvs-commits at lists.jboss.org]

Author: kabir.khan at jboss.com
Date: 2008-02-06 08:33:20 -0500 (Wed, 06 Feb 2008)
New Revision: 69649

Modified:
   trunk/system-jmx/src/main/org/jboss/system/microcontainer/jmx/ServiceControllerLifecycleCallback.java
Log:
[JBAS-5214] ServiceControllerLifecycleCallback.uninstall() should unregister mbean


Modified: trunk/system-jmx/src/main/org/jboss/system/microcontainer/jmx/ServiceControllerLifecycleCallback.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/system/microcontainer/jmx/ServiceControllerLifecycleCallback.java	2008-02-06 12:12:36 UTC (rev 69648)
+++ trunk/system-jmx/src/main/org/jboss/system/microcontainer/jmx/ServiceControllerLifecycleCallback.java	2008-02-06 13:33:20 UTC (rev 69649)
@@ -112,8 +112,23 @@
       JMX jmx = readJmxAnnotation(context);
       ObjectName objectName = createObjectName(context, jmx); 
 
-      log.debug("Unregistering MBean " + objectName);
-      serviceController.destroy(objectName);
+      try
+      {
+         log.debug("Unregistering MBean " + objectName);
+         serviceController.destroy(objectName);
+      }
+      finally
+      {
+         try
+         {
+            serviceController.remove(objectName);
+         }
+         catch(Exception e)
+         {
+            log.debug("Error unregistering mbean", e);
+         }
+      }
+      log.debug("Unregistered MBean " + objectName);
    }
    
    private JMX readJmxAnnotation(ControllerContext context) throws Exception