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

Merge pull request #1073 from wenshao/master

Browse Source 
bug fixed for DataSource fail-fast.
This commit is contained in:
wenshao
2016-02-05 14:42:02 +08:00
parent cdbec1d4f8 965c923757
commit 682c785548
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+19 -11
View File
@@ -1802,25 +1802,33 @@ public class DruidDataSource extends DruidAbstractDataSource
private void runInternal() {
for (;;) {
// addLast
lock.lock();
try {
// 必须存在线程等待，才创建连接
if (poolingCount >= notEmptyWaitThreadCount) {
createTaskCount--;
return;
boolean emptyWait = true;
if (createError != null && poolingCount == 0) {
emptyWait = false;
}
// 防止创建超过maxActive数量的连接
if (activeCount + poolingCount >= maxActive) {
createTaskCount--;
return;
if (emptyWait) {
// 必须存在线程等待，才创建连接
if (poolingCount >= notEmptyWaitThreadCount) {
createTaskCount--;
return;
}
// 防止创建超过maxActive数量的连接
if (activeCount + poolingCount >= maxActive) {
createTaskCount--;
return;
}
}
} finally {
lock.unlock();
}
PhysicalConnectionInfo physicalConnection = null;
try {