inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
78518: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      78365: ACE-234 Upgrade Spring Framework
         - Spring 3.2 Upgrade against 5.0 pt1. NOTE: does not build yet. Committing ready for myBatis upgrade merge in.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82582 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Erik Winlof
2014-09-03 12:25:04 +00:00
parent f4e6466c93
commit 2aecb5c5ac
2 changed files with 13 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
source/java/org/alfresco/repo/management/DynamicMBeanExporter.java
View File

@@ -7,7 +7,6 @@
*/
package org.alfresco.repo.management;
import javax.management.InstanceAlreadyExistsException;
import javax.management.JMException;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -53,18 +52,7 @@ public class DynamicMBeanExporter extends MBeanExporter implements DynamicMBeanE
*/
public void unregisterMBean(ObjectName objectName)
{
if (this.registeredBeans.remove(objectName))
{
try
{
this.server.unregisterMBean(objectName);
onUnregister(objectName);
}
catch (JMException e)
{
throw new RuntimeException(e);
}
}
doUnregister(objectName);
}
/*
@@ -87,22 +75,12 @@ public class DynamicMBeanExporter extends MBeanExporter implements DynamicMBeanE
ObjectName actualObjectName = objectName;
try
{
try
{
actualObjectName = this.server.registerMBean(mbean, objectName).getObjectName();
}
catch (InstanceAlreadyExistsException ex)
{
this.server.unregisterMBean(objectName);
actualObjectName = this.server.registerMBean(mbean, objectName).getObjectName();
}
doRegister(mbean, actualObjectName);
}
catch (JMException e)
{
throw new RuntimeException(e);
}
this.registeredBeans.add(actualObjectName);
onRegister(actualObjectName);
return actualObjectName;
}
}