You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/08/09 14:56:42 UTC

svn commit: r1371186 - in /openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server: ServiceManager.java SimpleServiceManager.java

Author: rmannibucau
Date: Thu Aug  9 12:56:41 2012
New Revision: 1371186

URL: http://svn.apache.org/viewvc?rev=1371186&view=rev
Log:
TOMEE-362 unregistering service mbeans when the servicemanager stops

Modified:
    openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java
    openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/SimpleServiceManager.java

Modified: openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java?rev=1371186&r1=1371185&r2=1371186&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java (original)
+++ openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java Thu Aug  9 12:56:41 2012
@@ -175,14 +175,16 @@ public abstract class ServiceManager {
         return null;
     }
 
-    public static void register(String serviceName, ServerService service, MBeanServer server) {
+    protected static ObjectName getObjectName(final String serviceName) {
         final ObjectNameBuilder jmxName = new ObjectNameBuilder("openejb");
         jmxName.set("type", "ServerService");
         jmxName.set("name", serviceName);
+        return jmxName.build();
+    }
 
+    public static void register(String serviceName, ServerService service, MBeanServer server) {
         try {
-            final ObjectName objectName = jmxName.build();
-            server.registerMBean(new ManagedMBean(service), objectName);
+            server.registerMBean(new ManagedMBean(service), getObjectName(serviceName));
         } catch (Exception e) {
             logger.error("Unable to register MBean ", e);
         }

Modified: openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/SimpleServiceManager.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/SimpleServiceManager.java?rev=1371186&r1=1371185&r2=1371186&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/SimpleServiceManager.java (original)
+++ openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/SimpleServiceManager.java Thu Aug  9 12:56:41 2012
@@ -107,7 +107,7 @@ public class SimpleServiceManager extend
         }
     }
 
-    private static ObjectName getObjectName() {
+    private static ObjectName getDiscoveryRegistryObjectName() {
         if (null == objectName) {
             final ObjectNameBuilder jmxName = new ObjectNameBuilder("openejb");
             jmxName.set("type", "Server");
@@ -131,7 +131,7 @@ public class SimpleServiceManager extend
 
         // register the mbean
         try {
-            LocalMBeanServer.get().registerMBean(new ManagedMBean(registry), getObjectName());
+            LocalMBeanServer.get().registerMBean(new ManagedMBean(registry), getDiscoveryRegistryObjectName());
         } catch (Throwable e) {
             logger.error("Failed to register 'openejb' MBean", e);
         }
@@ -222,7 +222,17 @@ public class SimpleServiceManager extend
 
         final ServerService[] services = daemons.clone();
 
+        final MBeanServer server = LocalMBeanServer.get();
         for (int i = 0; i < services.length; i++) {
+            final ObjectName on = getObjectName(services[i].getName());
+            if (server.isRegistered(on)) {
+                try {
+                    server.unregisterMBean(on);
+                } catch (Exception ignored) {
+                    // no-op
+                }
+            }
+
             try {
                 services[i].stop();
             } catch (ServiceException e) {
@@ -232,9 +242,7 @@ public class SimpleServiceManager extend
 
         // De-register the mbean
         try {
-
-            final MBeanServer server = LocalMBeanServer.get();
-            final ObjectName objectName = getObjectName();
+            final ObjectName objectName = getDiscoveryRegistryObjectName();
 
             if (server.isRegistered(objectName)) {
                 server.unregisterMBean(objectName);