etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix possible duplicated JMX registration issue

This commit is contained in:
Kelven Yang 2011-03-25 15:16:26 -07:00
parent 9ac33f8d52
commit 359dc18992
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/com/cloud/cluster/ClusterManagerImpl.java
View File

@ -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();

6
utils/src/com/cloud/utils/mgmt/JmxUtil.java
View File

@ -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;
}
}