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 #791 from yakolee/master

Browse Source 
fix issue #756 #788
This commit is contained in:
Yako
2015-02-06 17:03:56 +08:00
parent 715e2cb344 770504cce3
commit b347ec6227
2 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+4 -6
View File
@@ -1394,12 +1394,10 @@ public class DruidDataSource extends DruidAbstractDataSource
public Object run() {
ObjectName objectName = DruidDataSourceStatManager.addDataSource(DruidDataSource.this,
DruidDataSource.this.name);
if (objectName != null) {
DruidDataSource.this.setObjectName(objectName);
DruidDataSource.this.mbeanRegistered = true;
}
DruidDataSource.this.setObjectName(objectName);
DruidDataSource.this.mbeanRegistered = true;
return null;
}
});
src/main/java/com/alibaba/druid/stat/DruidDataSourceStatManager.java
+3 -12
View File
@@ -127,22 +127,13 @@ public class DruidDataSourceStatManager implements DruidDataSourceStatManagerMBe
}
public synchronized static ObjectName addDataSource(Object dataSource, String name) {
if (dataSource == null || name == null) {
return null;
}
final IdentityHashMap<Object, ObjectName> instances = getInstances();
synchronized (instances) {
MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer();
if (mbeanServer == null) {
return null;
}
if (instances.size() == 0) {
try {
ObjectName objectName = new ObjectName(MBEAN_NAME);
if (!mbeanServer.isRegistered(objectName)) {
mbeanServer.registerMBean(instance, objectName);
@@ -150,7 +141,7 @@ public class DruidDataSourceStatManager implements DruidDataSourceStatManagerMBe
} catch (JMException ex) {
LOG.error("register mbean error", ex);
}
DruidStatService.registerMBean();
}