Merge pull request #1110 from wenshao/master

bug fixed for phyTimeoutMillis

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

@@ -53,8 +53,6 @@ import javax.sql.ConnectionEventListener;
 import javax.sql.ConnectionPoolDataSource;
 import javax.sql.PooledConnection;
 
-import org.apache.ibatis.jdbc.SQL;
-
 import com.alibaba.druid.Constants;
 import com.alibaba.druid.TransactionTimeoutException;
 import com.alibaba.druid.VERSION;
@@ -2226,10 +2224,12 @@ public class DruidDataSource extends DruidAbstractDataSource
                 DruidConnectionHolder connection = connections[i];
 
                 if (checkTime) {
-                    long phyConnectTimeMillis = connection.getTimeMillis() - currentTimeMillis;//physical connection connected time
-                    if (phyTimeoutMillis > 0 && phyConnectTimeMillis > phyTimeoutMillis) {
-                        evictList.add(connection);
-                        continue;
+                    if (phyTimeoutMillis > 0) {
+                        long phyConnectTimeMillis = currentTimeMillis - connection.getTimeMillis();
+                        if (phyConnectTimeMillis > phyTimeoutMillis) {
+                            evictList.add(connection);
+                            continue;
+                        }
                     }
                     
                     long idleMillis = currentTimeMillis - connection.getLastActiveTimeMillis();

src/test/java/com/alibaba/druid/bvt/pool/basic/MaxPhyTimeMillisTest.java

@@ -0,0 +1,64 @@
+package com.alibaba.druid.bvt.pool.basic;
+
+import java.sql.Connection;
+
+import org.junit.Assert;
+
+import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.druid.pool.GetConnectionTimeoutException;
+import com.alibaba.druid.util.JdbcUtils;
+
+import junit.framework.TestCase;
+
+public class MaxPhyTimeMillisTest extends TestCase {
+
+    private DruidDataSource dataSource;
+
+    protected void setUp() throws Exception {
+        dataSource = new DruidDataSource();
+        dataSource.setUrl("jdbc:mock:xxx");
+        dataSource.setTestOnBorrow(false);
+        dataSource.setMaxActive(50);
+        dataSource.setMinIdle(5);
+        dataSource.setMinEvictableIdleTimeMillis(10);
+        dataSource.setPhyTimeoutMillis(100);
+        dataSource.setMaxWait(20);
+        dataSource.init();
+    }
+
+    protected void tearDown() throws Exception {
+        dataSource.close();
+    }
+
+    public void test_max() throws Exception {
+        connect(10);
+
+        Assert.assertEquals(10, dataSource.getPoolingCount());
+        Thread.sleep(20);
+        dataSource.shrink(true);
+        Assert.assertEquals(5, dataSource.getPoolingCount());
+
+        Thread.sleep(100);
+        dataSource.shrink(true);
+        Assert.assertEquals(0, dataSource.getPoolingCount());
+    }
+
+    public int connect(int count) throws Exception {
+        int successCount = 0;
+        Connection[] connections = new Connection[count];
+        for (int i = 0; i < count; ++i) {
+            try {
+                connections[i] = dataSource.getConnection();
+                successCount++;
+            } catch (GetConnectionTimeoutException e) {
+                // skip
+            }
+        }
+
+        for (int i = 0; i < count; ++i) {
+            JdbcUtils.close(connections[i]);
+        }
+
+        return successCount;
+    }
+}