[jboss-cvs] JBoss Messaging SVN: r6416 - trunk/src/main/org/jboss/messaging/core/management/impl.

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

Author: jmesnil
Date: 2009-04-14 05:45:21 -0400 (Tue, 14 Apr 2009)
New Revision: 6416

Modified:
   trunk/src/main/org/jboss/messaging/core/management/impl/ManagementServiceImpl.java
Log:
management resources cleanup

* when stopping the management service, unregister JBM's mbeans from the mbean server. Most of resources are already unregistered during JBM server stop operations but there are others which are not (e.g. diverts)

Modified: trunk/src/main/org/jboss/messaging/core/management/impl/ManagementServiceImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/impl/ManagementServiceImpl.java	2009-04-14 09:34:07 UTC (rev 6415)
+++ trunk/src/main/org/jboss/messaging/core/management/impl/ManagementServiceImpl.java	2009-04-14 09:45:21 UTC (rev 6416)
@@ -529,8 +529,17 @@
 
       for (String resourceName : resourceNames)
       {
-         unregisterFromRegistry(resourceName);
+         unregisterFromRegistry(resourceName);         
       }
+      
+      if (jmxManagementEnabled)
+      {
+         Set<ObjectName> names = mbeanServer.queryNames(ObjectName.getInstance(ObjectNames.DOMAIN + ":*"), null);
+         for (ObjectName name : names)
+         {
+            mbeanServer.unregisterMBean(name);
+         }
+      }
 
       replicationInvoker.stop();