Additional safety check to only apply the new conditional when minimumIdle is 0.

10 years ago · e883786cea
parent fefe559822
commit e883786cea
2 changed files with 2 additions and 2 deletions
--- a/hikaricp-java6/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
+++ b/hikaricp-java6/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
@ -329,7 +329,7 @@ public final class HikariPool implements HikariPoolMBean, IBagStateListener
            final int minIdle = configuration.getMinimumIdle();
            while (!isShutdown && totalConnections.get() < maxPoolSize && (minIdle == 0 || getIdleConnections() < minIdle)) {
               if (!addConnection()) {
-                  if (getThreadsAwaitingConnection() == 0) {
+                  if (minIdle == 0 && getThreadsAwaitingConnection() == 0) {
                     break;
                  }
                  
--- a/hikaricp/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
+++ b/hikaricp/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
@ -323,7 +323,7 @@ public final class HikariPool implements HikariPoolMBean, IBagStateListener
         final int minIdle = configuration.getMinimumIdle();
         while (!isShutdown && totalConnections.get() < maxPoolSize && (minIdle == 0 || getIdleConnections() < minIdle)) {
            if (!addConnection()) {
-               if (getThreadsAwaitingConnection() == 0) {
+               if (minIdle == 0 && getThreadsAwaitingConnection() == 0) {
                  break;
               }