bug fixed

git-svn-id: http://code.alibabatech.com/svn/druid/trunk@567 b9813039-fb51-4c41-a8b9-e21c2acb5095
2023-03-04 19:17:16 +00:00 · 2011-09-02 13:35:51 +00:00
parent 1f407510a9
commit 8c0adbe424
1 changed files with 2 additions and 1 deletions
@@ -654,7 +654,8 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
                    }

                    // 防止创建超过maxActive数量的连接
-                    if (activeCount + poolingCount >= maxIdle) {
+                    int max = maxActive > maxIdle ? maxActive : maxIdle;
+                    if (activeCount + poolingCount >= max) {
                        lowWater.await();
                        continue;
                    }