From 32fa545e0f6fb4e05aa5b94f306e4e9e47166e75 Mon Sep 17 00:00:00 2001
From: Brett Wooldridge <brett.wooldridge@gmail.com>
Date: Thu, 11 Dec 2014 22:22:03 +0900
Subject: [PATCH] Attempt to bound how long a connection.close() call can take
 to 30 seconds on JDBC41 drivers.

---
 .../main/java/com/zaxxer/hikari/util/PoolUtilities.java   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/hikaricp-common/src/main/java/com/zaxxer/hikari/util/PoolUtilities.java b/hikaricp-common/src/main/java/com/zaxxer/hikari/util/PoolUtilities.java
index dc8c25a1..b8818ffc 100644
--- a/hikaricp-common/src/main/java/com/zaxxer/hikari/util/PoolUtilities.java
+++ b/hikaricp-common/src/main/java/com/zaxxer/hikari/util/PoolUtilities.java
@@ -41,7 +41,13 @@ public final class PoolUtilities
    {
       if (connection != null) {
          try {
-            setNetworkTimeout(executorService, connection, TimeUnit.SECONDS.toMillis(30), true);
+            try {
+               setNetworkTimeout(executorService, connection, TimeUnit.SECONDS.toMillis(30), true);
+            }
+            catch (SQLException e) {
+               // keep going, close anyway
+            }
+
             connection.close();
          }
          catch (Exception e) {