Merge da4832aa85 into 6024bcf122

fix removecount calculation bug(A connection may meet the calculation conditions of both evictCount and keepAliveCount at the same time, resulting in duplicate calculations)
Fix issue#6318：该问题导致误判连接池空闲连接不足，创建多余连接
2025-07-24 10:37:47 +03:00 · 2025-07-13 17:56:33 +08:00 · 2025-06-08 15:57:43 +08:00
1 changed files with 6 additions and 1 deletions
--- a/core/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+++ b/core/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
@ -3149,6 +3149,9 @@ public class DruidDataSource extends DruidAbstractDataSource

            // shrink connections by HotSpot intrinsic function _arraycopy for performance optimization.
            int removeCount = evictCount + keepAliveCount;
+            if (removeCount > poolingCount) {
+                removeCount = poolingCount;
+            }
            if (removeCount > 0) {
                int breakedCount = poolingCount - i;
                if (breakedCount > 0) {
@ -3253,7 +3256,9 @@ public class DruidDataSource extends DruidAbstractDataSource
            lock.lock();
            try {
                int fillCount = minIdle - (activeCount + poolingCount + createTaskCount);
-                emptySignal(fillCount);
+                if (fillCount > 0) {
+                    emptySignal(fillCount);
+                }
            } finally {
                lock.unlock();
            }
Author	SHA1	Message	Date
WuTaoyu	b1238eae4a	Merge `da4832aa85` into `6024bcf122`	2025-07-24 10:37:47 +03:00
WuTaoyu	da4832aa85	fix removecount calculation bug(A connection may meet the calculation conditions of both evictCount and keepAliveCount at the same time, resulting in duplicate calculations)	2025-07-13 17:56:33 +08:00
WuTaoyu	7538dc54a7	Fix issue#6318：该问题导致误判连接池空闲连接不足，创建多余连接	2025-06-08 15:57:43 +08:00