diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index d3ea30bd68..0e57489a6c 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -2528,10 +2528,10 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat return false; } - return put(holder, physicalConnectionInfo.createTaskId); + return put(holder, physicalConnectionInfo.createTaskId, false); } - private boolean put(DruidConnectionHolder holder, long createTaskId) { + private boolean put(DruidConnectionHolder holder, long createTaskId, boolean checkExists) { lock.lock(); try { if (this.closing || this.closed) { @@ -2544,6 +2544,15 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat } return false; } + + if (checkExists) { + for (int i = 0; i < poolingCount; i++) { + if (connections[i] == holder) { + return false; + } + } + } + connections[poolingCount] = holder; incrementPoolingCount(); @@ -3207,7 +3216,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat boolean discard = !validate; if (validate) { holer.lastKeepTimeMillis = System.currentTimeMillis(); - boolean putOk = put(holer, 0L); + boolean putOk = put(holer, 0L, true); if (!putOk) { discard = true; } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/Issue4316.java b/src/test/java/com/alibaba/druid/bvt/pool/Issue4316.java new file mode 100644 index 0000000000..6af2289bc3 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/pool/Issue4316.java @@ -0,0 +1,35 @@ +package com.alibaba.druid.bvt.pool; + +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.pool.DruidPooledConnection; +import org.junit.Test; + +import static org.junit.Assert.assertFalse; + +public class Issue4316 { + @Test + public void test_0() throws Exception { + DruidDataSource druidDataSource = new DruidDataSource(); + druidDataSource.setUsername(""); + druidDataSource.setPassword(""); + druidDataSource.setUrl("jdbc:mock:xxx"); + druidDataSource.setValidationQuery("select 1"); + druidDataSource.setMinEvictableIdleTimeMillis(100000); + druidDataSource.setMaxEvictableIdleTimeMillis(DruidDataSource.DEFAULT_MAX_EVICTABLE_IDLE_TIME_MILLIS); + druidDataSource.setKeepAliveBetweenTimeMillis(120000); + druidDataSource.setMinIdle(2); + druidDataSource.setTimeBetweenEvictionRunsMillis(70000); + druidDataSource.setKeepAlive(true); + DruidPooledConnection connection1 = druidDataSource.getConnection(); + DruidPooledConnection connection2 = druidDataSource.getConnection(); + connection2.close(); + Thread.sleep(95000); + connection1.close(); + Thread.sleep(140000); + DruidPooledConnection connection3 = druidDataSource.getConnection(); + DruidPooledConnection connection4 = druidDataSource.getConnection(); + assertFalse(connection3.getConnectionHolder() == connection4.getConnectionHolder()); + connection3.close(); + connection4.close(); + } +}