Merge pull request #86 in CORE/base-third from release/10.0 to 10.0

* commit '298a36ade75cd0472e0b850a7f357442c36b4a33':
  线程切换，多线程同步问题
  fix import
  druid断线重连机制修复

fine-druid/src/com/fr/third/alibaba/druid/pool/DruidDataSource.java

@@ -143,7 +143,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
     private LogStatsThread logStatsThread;
     private int createTaskCount;
 
-    private final CountDownLatch             initedLatch             = new CountDownLatch(2);
+    private CountDownLatch initedLatch = new CountDownLatch(2);
 
     private volatile boolean enable = true;
 
@@ -167,11 +167,11 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
 
     private volatile boolean keepAlive = false;
 
-    public DruidDataSource(){
+    public DruidDataSource() {
         this(false);
     }
 
-    public DruidDataSource(boolean fairLock){
+    public DruidDataSource(boolean fairLock) {
         super(fairLock);
 
         configFromPropety(System.getProperties());
@@ -602,6 +602,34 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
         this.connectProperties = properties;
     }
 
+    private synchronized void createThreadChange() {
+        String threadName = "Druid-ConnectionPool-Create-" + System.identityHashCode(this) + this.getUrl();
+        createConnectionThread = new CreateConnectionThread(threadName);
+        createConnectionThread.setStarted(false);
+        String destroyName = "Druid-ConnectionPool-Destroy-" + System.identityHashCode(this) + this.getUrl();
+        destroyConnectionThread = new DestroyConnectionThread(destroyName);
+        destroyConnectionThread.setStarted(false);
+        initedLatch = new CountDownLatch(2);
+    }
+
+    private void checkThread() throws SQLException {
+        if (!createConnectionThread.isStarted() && !destroyConnectionThread.isStarted()) {
+            synchronized (this) {//线程安全问题，加个双检锁
+                if (!createConnectionThread.isStarted() && !destroyConnectionThread.isStarted()) {
+                    createConnectionThread.setStarted(true);
+                    createConnectionThread.start();
+                    destroyConnectionThread.setStarted(true);
+                    destroyConnectionThread.start();
+                    try {
+                        initedLatch.await();
+                    } catch (InterruptedException e) {
+                        throw new SQLException(e.getMessage(), e);
+                    }
+                }
+            }
+        }
+    }
+
     public void init() throws SQLException {
         if (inited) {
             return;
@@ -817,7 +845,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
 
     protected void createAndStartCreatorThread() {
         if (createScheduler == null) {
-            String threadName = "Druid-ConnectionPool-Create-" + System.identityHashCode(this);
+            String threadName = "Druid-ConnectionPool-Create-" + System.identityHashCode(this) + this.getUrl();
             createConnectionThread = new CreateConnectionThread(threadName);
             createConnectionThread.start();
             return;
@@ -1055,7 +1083,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
 
     public DruidPooledConnection getConnection(long maxWaitMillis) throws SQLException {
         init();
-
+        checkThread();
         if (filters.size() > 0) {
             FilterChainImpl filterChain = new FilterChainImpl(this);
             return filterChain.dataSource_connect(this, maxWaitMillis);
@@ -1076,7 +1104,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
 
     public DruidPooledConnection getConnectionDirect(long maxWaitMillis) throws SQLException {
         int notFullTimeoutRetryCnt = 0;
-        for (;;) {
+        for (; ; ) {
             // handle notFullTimeoutRetry
             DruidPooledConnection poolableConnection;
             try {
@@ -1235,7 +1263,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
         if (holder == null) {
             Throwable throwable = this.createError;
             if (throwable != null) {
-                if(throwable instanceof SQLException){
+                if (throwable instanceof SQLException) {
                     throw (SQLException) throwable;
                 }
                 throw new GetConnectionTimeoutException(throwable.getMessage(), throwable);
@@ -1249,7 +1277,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
                         .append(", maxActive " + maxActive)//
                 ;
                 JdbcDataSourceStat sourceStat = this.getDataSourceStat();
-                if(sourceStat != null) {
+                if (sourceStat != null) {
                     List<JdbcSqlStatValue> sqlList = sourceStat.getRuningSqlList();
                     for (int i = 0; i < sqlList.size(); ++i) {
                         if (i != 0) {
@@ -1633,7 +1661,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
     private DruidConnectionHolder pollLast(long nanos) throws InterruptedException, SQLException {
         long estimate = nanos;
 
-        for (;;) {
+        for (; ; ) {
             if (poolingCount == 0) {
                 emptySignal(); // send signal to CreateThread create connection
 
@@ -1946,7 +1974,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
         }
 
         private void runInternal() {
-            for (;;) {
+            for (; ; ) {
 
                 // addLast
                 lock.lock();
@@ -2043,8 +2071,9 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
     }
 
     public class CreateConnectionThread extends Thread {
+        private volatile boolean started = true;
 
-        public CreateConnectionThread(String name){
+        public CreateConnectionThread(String name) {
             super(name);
             this.setDaemon(true);
         }
@@ -2054,7 +2083,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
 
             long lastDiscardCount = 0;
             int errorCount = 0;
-            for (;;) {
+            for (; ; ) {
                 // addLast
                 try {
                     lock.lockInterruptibly();
@@ -2126,6 +2155,8 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
                         } catch (InterruptedException interruptEx) {
                             break;
                         }
+                        DruidDataSource.this.createThreadChange();
+                        break;
                     }
                 } catch (RuntimeException e) {
                     LOG.error("create connection error", e);
@@ -2150,11 +2181,20 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
                 errorCount = 0; // reset errorCount
             }
         }
+
+        public boolean isStarted() {
+            return started;
+        }
+
+        public void setStarted(boolean started) {
+            this.started = started;
+        }
     }
 
     public class DestroyConnectionThread extends Thread {
+        private volatile boolean started = true;
 
-        public DestroyConnectionThread(String name){
+        public DestroyConnectionThread(String name) {
             super(name);
             this.setDaemon(true);
         }
@@ -2162,7 +2202,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
         public void run() {
             initedLatch.countDown();
 
-            for (;;) {
+            for (; ; ) {
                 // 从前面开始删除
                 try {
                     if (closed) {
@@ -2186,6 +2226,13 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
             }
         }
 
+        public boolean isStarted() {
+            return started;
+        }
+
+        public void setStarted(boolean started) {
+            this.started = started;
+        }
     }
 
     public class DestroyTask implements Runnable {
@@ -2203,14 +2250,14 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
 
     public class LogStatsThread extends Thread {
 
-        public LogStatsThread(String name){
+        public LogStatsThread(String name) {
             super(name);
             this.setDaemon(true);
         }
 
         public void run() {
             try {
-                for (;;) {
+                for (; ; ) {
                     try {
                         logStats();
                     } catch (Exception e) {
@@ -2236,7 +2283,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
         try {
             Iterator<DruidPooledConnection> iter = activeConnections.keySet().iterator();
 
-            for (; iter.hasNext();) {
+            for (; iter.hasNext(); ) {
                 DruidPooledConnection pooledConnection = iter.next();
 
                 if (pooledConnection.isRunning()) {
@@ -2304,7 +2351,9 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
         return removeCount;
     }
 
-    /** Instance key */
+    /**
+     * Instance key
+     */
     protected String instanceKey = null;
 
     public Reference getReference() throws NamingException {
@@ -2998,7 +3047,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
         }
 
         int fillCount = 0;
-        for (;;) {
+        for (; ; ) {
             try {
                 lock.lockInterruptibly();
             } catch (InterruptedException e) {