From 6f9e8167cb22a44cefd7503f0104841fe0b25db1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B8=A9=E7=BB=8D=E9=94=A6?= Date: Sun, 7 Apr 2019 18:34:52 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E8=A7=A3=E5=86=B3Druid=E5=A4=9Aclass?= =?UTF-8?q?loader=20=20Mbean=E6=B3=A8=E5=86=8C=E5=8D=B8=E8=BD=BD=E8=BF=87?= =?UTF-8?q?=E7=A8=8B=E4=B8=AD=E7=9A=84=E9=97=AE=E9=A2=98=20"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alibaba/druid/stat/DruidDataSourceStatManager.java | 8 ++------ .../java/com/alibaba/druid/stat/DruidStatService.java | 10 ++++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/alibaba/druid/stat/DruidDataSourceStatManager.java b/src/main/java/com/alibaba/druid/stat/DruidDataSourceStatManager.java index 8f9c13315d..3a8b7d6585 100644 --- a/src/main/java/com/alibaba/druid/stat/DruidDataSourceStatManager.java +++ b/src/main/java/com/alibaba/druid/stat/DruidDataSourceStatManager.java @@ -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); } diff --git a/src/main/java/com/alibaba/druid/stat/DruidStatService.java b/src/main/java/com/alibaba/druid/stat/DruidStatService.java index e9f75127bb..9c571ed6a4 100644 --- a/src/main/java/com/alibaba/druid/stat/DruidStatService.java +++ b/src/main/java/com/alibaba/druid/stat/DruidStatService.java @@ -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); }