Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3167 from alibaba/revert-3164-master-Mbean

Browse Source 
Revert "解决Druid多classloader  Mbean注册卸载过程中的问题 "
This commit is contained in:
温绍锦
2019-04-07 18:35:05 +08:00
committed by GitHub
parent 8c895c867e 6f9e8167cb
commit 4a79e70d6b
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/stat/DruidDataSourceStatManager.java
+2 -6
View File
@@ -144,9 +144,7 @@ public class DruidDataSourceStatManager implements DruidDataSourceStatManagerMBe
synchronized (instances) {
if (instances.size() == 0) {
try {
int id = System.identityHashCode(instance.getClass());
ObjectName objectName = new ObjectName(MBEAN_NAME + ",id=" + id);
// ObjectName objectName = new ObjectName(MBEAN_NAME);
ObjectName objectName = new ObjectName(MBEAN_NAME);
if (!mbeanServer.isRegistered(objectName)) {
mbeanServer.registerMBean(instance, objectName);
}
@@ -208,9 +206,7 @@ public class DruidDataSourceStatManager implements DruidDataSourceStatManagerMBe
if (instances.size() == 0) {
try {
int id = System.identityHashCode(instance.getClass());
ObjectName objName = new ObjectName(MBEAN_NAME + ",id=" + id);
mbeanServer.unregisterMBean(objName);
mbeanServer.unregisterMBean(new ObjectName(MBEAN_NAME));
} catch (Throwable ex) {
LOG.error("unregister mbean error", ex);
}
src/main/java/com/alibaba/druid/stat/DruidStatService.java
+4 -6
View File
@@ -357,9 +357,8 @@ public final class DruidStatService implements DruidStatServiceMBean {
public static void registerMBean() {
MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer();
try {
int id = System.identityHashCode(instance.getClass());
ObjectName objectName = new ObjectName(MBEAN_NAME + ",id=" + id);
// ObjectName objectName = new ObjectName(MBEAN_NAME);
ObjectName objectName = new ObjectName(MBEAN_NAME);
if (!mbeanServer.isRegistered(objectName)) {
mbeanServer.registerMBean(instance, objectName);
}
@@ -370,10 +369,9 @@ public final class DruidStatService implements DruidStatServiceMBean {
public static void unregisterMBean() {
MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer();
try {
int id = System.identityHashCode(instance.getClass());
ObjectName objectName = new ObjectName(MBEAN_NAME + ",id=" + id);
mbeanServer.unregisterMBean(objectName);
mbeanServer.unregisterMBean(new ObjectName(MBEAN_NAME));
} catch (JMException ex) {
LOG.error("unregister mbean error", ex);
}