From 359dc18992b869e21ab9c3626eb044d65efb0e6f Mon Sep 17 00:00:00 2001
From: Kelven Yang <kelven@cloud.com>
Date: Fri, 25 Mar 2011 15:16:26 -0700
Subject: [PATCH] Fix possible duplicated JMX registration issue

---
 server/src/com/cloud/cluster/ClusterManagerImpl.java | 2 --
 utils/src/com/cloud/utils/mgmt/JmxUtil.java          | 6 ++++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/src/com/cloud/cluster/ClusterManagerImpl.java b/server/src/com/cloud/cluster/ClusterManagerImpl.java
index 9669f947189..3cc9dd7849a 100644
--- a/server/src/com/cloud/cluster/ClusterManagerImpl.java
+++ b/server/src/com/cloud/cluster/ClusterManagerImpl.java
@@ -171,8 +171,6 @@ public class ClusterManagerImpl implements ClusterManager {
         return false;  //TODO: Leaving this for Kelven to take care of.
     }
     
-    
-    
     @Override
     public void broadcast(long agentId, Command[] cmds) {
 		Date cutTime = DateUtil.currentGMTTime();
diff --git a/utils/src/com/cloud/utils/mgmt/JmxUtil.java b/utils/src/com/cloud/utils/mgmt/JmxUtil.java
index 6e8c38034de..22623fba73d 100755
--- a/utils/src/com/cloud/utils/mgmt/JmxUtil.java
+++ b/utils/src/com/cloud/utils/mgmt/JmxUtil.java
@@ -47,11 +47,13 @@ public class JmxUtil {
         ArrayList<MBeanServer> server = MBeanServerFactory.findMBeanServer(null);
         if (server.size() > 0) {
             MBeanServer mBeanServer = server.get(0);
-            mBeanServer.registerMBean(mbean, objectName);
+            if(!mBeanServer.isRegistered(objectName))
+            	mBeanServer.registerMBean(mbean, objectName);
             return objectName;
         } else {
         	MBeanServer mBeanServer = ManagementFactory.getPlatformMBeanServer();
-            mBeanServer.registerMBean(mbean, objectName);
+        	if(!mBeanServer.isRegistered(objectName))
+        		mBeanServer.registerMBean(mbean, objectName);
             return objectName;
         }
     }