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

git-svn-id: http://code.alibabatech.com/svn/druid/trunk@577 b9813039-fb51-4c41-a8b9-e21c2acb5095

Browse Source
This commit is contained in:
wenshao
2011-09-02 15:46:54 +00:00
parent 98ae834802
commit 7d65e259e0
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+4 -4
View File
@@ -514,10 +514,9 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
throw ie;
}
int lastIndex = poolingCount - 1;
ConnectionHolder last = connections[lastIndex];
connections[lastIndex] = null;
poolingCount--;
ConnectionHolder last = connections[poolingCount];
connections[poolingCount] = null;
// if ((minIdle == 0 && poolingCount == 0) || poolingCount <= minIdle - 1) {
// lowWater.signal();
@@ -532,6 +531,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
ConnectionHolder pollLast(long timeout, TimeUnit unit) throws InterruptedException {
long estimate = unit.toNanos(timeout);
FOR_0:
for (;;) {
if (activeCount >= maxActive) {
estimate = notMaxActive.awaitNanos(estimate);
@@ -545,7 +545,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
if (poolingCount == 0) {
if (estimate > 0) {
continue;
continue FOR_0;
}
return null;