Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

解决并发创建连接达不到maxActive的问题

Browse Source 
git-svn-id: http://code.alibabatech.com/svn/druid/trunk@562 b9813039-fb51-4c41-a8b9-e21c2acb5095
This commit is contained in:
wenshao
2011-09-02 11:32:40 +00:00
parent 4f434ac3f2
commit 97a914a99c
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+7 -5
View File
@@ -85,7 +85,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
// store
private ConnectionHolder[] connections;
private int poolingCount = 0;
private volatile int poolingCount = 0;
private int activeCount = 0;
// threads
@@ -532,9 +532,9 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
connections[lastIndex] = null;
poolingCount--;
// if (count <= minIdle - 1) {
// lowWater.signal();
// }
if ((minIdle == 0 && poolingCount == 0) || poolingCount <= minIdle - 1) {
lowWater.signal();
}
// if (count == 0) {
// lowWater.signal();
// }
@@ -580,7 +580,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
// if (lastIndex == minIdle - 1) {
// lowWater.signal();
// }
if (poolingCount == 0) {
if ((minIdle == 0 && poolingCount == 0) || poolingCount <= minIdle - 1) {
lowWater.signal();
}
@@ -645,10 +645,12 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
// not wait
} else if (poolingCount >= minIdle) {
lowWater.await();
continue;
}
// 防止创建超过maxActive数量的连接
if (activeCount >= maxActive) {
lowWater.await();
continue;
}