监控

git-svn-id: http://code.alibabatech.com/svn/druid/trunk@672 b9813039-fb51-4c41-a8b9-e21c2acb5095

src/main/java/com/alibaba/druid/pool/DruidDataSource.java

@@ -23,7 +23,6 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Properties;
-import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Condition;
@@ -48,6 +47,7 @@ import com.alibaba.druid.pool.vendor.OracleValidConnectionChecker;
 import com.alibaba.druid.pool.vendor.SybaseExceptionSorter;
 import com.alibaba.druid.proxy.DruidDriver;
 import com.alibaba.druid.proxy.jdbc.DataSourceProxyConfig;
+import com.alibaba.druid.stat.DruidDataSourceStatManager;
 import com.alibaba.druid.util.JdbcUtils;
 
 /**
@@ -224,7 +224,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
             inited = true;
 
             createdTime = new Date();
-            Global.add(this);
+            DruidDataSourceStatManager.add(this);
 
             if (connectError != null && poolingCount == 0) {
                 throw connectError;
@@ -497,7 +497,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
                 }
             }
             poolingCount = 0;
-            Global.remove(this);
+            DruidDataSourceStatManager.remove(this);
 
             enable = false;
             notEmpty.signalAll();
@@ -796,10 +796,6 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
         return names;
     }
 
-    public static Set<DruidDataSource> getInstances() {
-        return Global.getInstances();
-    }
-
     public int getRawDriverMajorVersion() {
         int version = -1;
         if (this.driver != null) {