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

rename method

Browse Source
This commit is contained in:
wenshao
2012-08-12 09:34:45 +08:00
parent 6f314a1b82
commit bc2254d767
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+2 -2
View File
@@ -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();
src/main/java/com/alibaba/druid/stat/DruidDataSourceStatManager.java
+10 -10
View File
@@ -111,12 +111,12 @@ public class DruidDataSourceStatManager implements DruidDataSourceStatManagerMBe
return instances;
}
public synchronized static ObjectName add(Object dataSource, String name) {
final IdentityHashMap<Object, ObjectName> dataSources = getInstances();
public synchronized static ObjectName addDataSource(Object dataSource, String name) {
final IdentityHashMap<Object, ObjectName> 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<Object, ObjectName> dataSources = getInstances();
public synchronized static void removeDataSource(Object dataSource) {
IdentityHashMap<Object, ObjectName> 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) {