diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index bbd6f3cb25..7c93369a95 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -421,7 +421,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat initedLatch.await(); initedTime = new Date(); - ObjectName objectName = DruidDataSourceStatManager.add(this, this.name); + ObjectName objectName = DruidDataSourceStatManager.addDataSource(this, this.name); this.setObjectName(objectName); if (connectError != null && poolingCount == 0) { @@ -777,7 +777,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat } } poolingCount = 0; - DruidDataSourceStatManager.remove(this); + DruidDataSourceStatManager.removeDataSource(this); enable = false; notEmpty.signalAll(); diff --git a/src/main/java/com/alibaba/druid/stat/DruidDataSourceStatManager.java b/src/main/java/com/alibaba/druid/stat/DruidDataSourceStatManager.java index 470df4bd4a..ca8b1e7f45 100644 --- a/src/main/java/com/alibaba/druid/stat/DruidDataSourceStatManager.java +++ b/src/main/java/com/alibaba/druid/stat/DruidDataSourceStatManager.java @@ -111,12 +111,12 @@ public class DruidDataSourceStatManager implements DruidDataSourceStatManagerMBe return instances; } - public synchronized static ObjectName add(Object dataSource, String name) { - final IdentityHashMap dataSources = getInstances(); + public synchronized static ObjectName addDataSource(Object dataSource, String name) { + final IdentityHashMap instances = getInstances(); - synchronized (dataSources) { + synchronized (instances) { MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer(); - if (dataSources.size() == 0) { + if (instances.size() == 0) { try { ObjectName objectName = new ObjectName(MBEAN_NAME); @@ -150,16 +150,16 @@ public class DruidDataSourceStatManager implements DruidDataSourceStatManagerMBe } } - dataSources.put(dataSource, objectName); + instances.put(dataSource, objectName); return objectName; } } - public synchronized static void remove(Object dataSource) { - IdentityHashMap dataSources = getInstances(); + public synchronized static void removeDataSource(Object dataSource) { + IdentityHashMap instances = getInstances(); - synchronized (dataSources) { - ObjectName objectName = (ObjectName) dataSources.remove(dataSource); + synchronized (instances) { + ObjectName objectName = (ObjectName) instances.remove(dataSource); if (objectName == null) { objectName = DruidDataSourceUtils.getObjectName(dataSource); @@ -180,7 +180,7 @@ public class DruidDataSourceStatManager implements DruidDataSourceStatManagerMBe } } - if (dataSources.size() == 0) { + if (instances.size() == 0) { try { mbeanServer.unregisterMBean(new ObjectName(MBEAN_NAME)); } catch (JMException ex) {