bug fixed for fail fast.

This commit is contained in:
shaojin.wensj
2019-03-19 19:48:42 +08:00
parent c8ffb82508
commit 9aa1798149
3 changed files with 57 additions and 9 deletions
@@ -1990,7 +1990,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
while (poolingCount == 0) {
emptySignal(); // send signal to CreateThread create connection
if (failFast && failContinuous.get()) {
if (failFast && isFailContinuous()) {
throw new DataSourceNotAvailableException(createError);
}
@@ -2030,7 +2030,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
if (poolingCount == 0) {
emptySignal(); // send signal to CreateThread create connection
if (failFast && failContinuous.get()) {
if (failFast && isFailContinuous()) {
throw new DataSourceNotAvailableException(createError);
}
@@ -2377,8 +2377,10 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
if (emptyWait) {
// 必须存在线程等待,才创建连接
if (poolingCount >= notEmptyWaitThreadCount //
&& !(keepAlive && activeCount + poolingCount < minIdle)
&& !initTask) {
&& (!(keepAlive && activeCount + poolingCount < minIdle))
&& (!initTask)
&& !isFailContinuous()
) {
createTaskCount--;
return;
}
@@ -2541,7 +2543,9 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
if (emptyWait) {
// 必须存在线程等待,才创建连接
if (poolingCount >= notEmptyWaitThreadCount //
&& !(keepAlive && activeCount + poolingCount < minIdle)) {
&& (!(keepAlive && activeCount + poolingCount < minIdle))
&& !isFailContinuous()
) {
empty.await();
}