diff --git a/src/main/java/com/zaxxer/hikari/pool/PoolBase.java b/src/main/java/com/zaxxer/hikari/pool/PoolBase.java index 7f0689b9..1ffff702 100644 --- a/src/main/java/com/zaxxer/hikari/pool/PoolBase.java +++ b/src/main/java/com/zaxxer/hikari/pool/PoolBase.java @@ -128,9 +128,10 @@ abstract class PoolBase try { LOGGER.debug("{} - Closing connection {}: {}", poolName, connection, closureReason); try { - setNetworkTimeout(connection, SECONDS.toMillis(15)); - } - finally { + if (!connection.isClosed()) { + setNetworkTimeout(connection, SECONDS.toMillis(15)); + } + } finally { connection.close(); // continue with the close even if setNetworkTimeout() throws } }