fixes #2265 bail out of the pool filling loop if the thread is interrupted

brettwooldridge · brettwooldridge · commit 4da46f5911f2 · 2025-07-29T01:41:00.000+09:00
diff --git a/CHANGES b/CHANGES
@@ -7,6 +7,8 @@ Changes in 7.0.0
 
  * fixed #1294 add support for HikariCredentialsProvider class
 
+ * fixed #2265 bail out of the pool filling loop if the thread is interrupted
+
 Changes in 6.3.2
 
  * fixed #2342 restore module-info.class to jar file, which was lost in 6.3.1
diff --git a/src/main/java/com/zaxxer/hikari/pool/HikariPool.java b/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
@@ -777,12 +777,12 @@ else if (!added)
 
       /**
        * We only create connections if we need another idle connection or have threads still waiting
-       * for a new connection.  Otherwise we bail out of the request to create.
+       * for a new connection. Otherwise, we bail out of the request to create.
        *
        * @return true if we should create a connection, false if the need has disappeared
        */
       private synchronized boolean shouldContinueCreating() {
-         return poolState == POOL_NORMAL && getTotalConnections() < config.getMaximumPoolSize() &&
+         return poolState == POOL_NORMAL && !Thread.interrupted() && getTotalConnections() < config.getMaximumPoolSize() &&
             (getIdleConnections() < config.getMinimumIdle() || connectionBag.getWaitingThreadCount() > getIdleConnections());
       }
    }

Original file line number	Diff line number	Diff line change
`@@ -777,12 +777,12 @@ else if (!added)`
`777`	`777`
`778`	`778`	`/**`
`779`	`779`	`* We only create connections if we need another idle connection or have threads still waiting`
`780`		`- * for a new connection. Otherwise we bail out of the request to create.`
	`780`	`+ * for a new connection. Otherwise, we bail out of the request to create.`
`781`	`781`	`*`
`782`	`782`	`* @return true if we should create a connection, false if the need has disappeared`
`783`	`783`	`*/`
`784`	`784`	`private synchronized boolean shouldContinueCreating() {`
`785`		`- return poolState == POOL_NORMAL && getTotalConnections() < config.getMaximumPoolSize() &&`
	`785`	`+ return poolState == POOL_NORMAL && !Thread.interrupted() && getTotalConnections() < config.getMaximumPoolSize() &&`
`786`	`786`	`(getIdleConnections() < config.getMinimumIdle() \|\| connectionBag.getWaitingThreadCount() > getIdleConnections());`
`787`	`787`	`}`
`788`	`788`	`}`