Fix #175 add additional SQLFeatureNotSupportedException detection for misbehaved MariaDB driver

10 years ago · 1d0879c0ee
parent 37e24d630a
commit 1d0879c0ee
2 changed files with 18 additions and 8 deletions
--- a/hikaricp-java6/src/main/java/com/zaxxer/hikari/util/PoolUtilities.java
+++ b/hikaricp-java6/src/main/java/com/zaxxer/hikari/util/PoolUtilities.java
@ -295,10 +295,15 @@ public final class PoolUtilities
         return 0;
      }

-      final int networkTimeout = connection.getNetworkTimeout();
-      connection.setNetworkTimeout(executor, (int) timeoutMs); 
-
-      return networkTimeout;
+      try {
+         final int networkTimeout = connection.getNetworkTimeout();
+         connection.setNetworkTimeout(executor, (int) timeoutMs);
+         return networkTimeout;
+      }
+      catch (SQLFeatureNotSupportedException e) {
+         IS_JDBC41 = false;
+         return 0;
+      }
   }

   /**
--- a/hikaricp/src/main/java/com/zaxxer/hikari/util/PoolUtilities.java
+++ b/hikaricp/src/main/java/com/zaxxer/hikari/util/PoolUtilities.java
@ -268,10 +268,15 @@ public final class PoolUtilities
         return 0;
      }

-      final int networkTimeout = connection.getNetworkTimeout();
-      connection.setNetworkTimeout(executor, (int) timeoutMs); 
-
-      return networkTimeout;
+      try {
+         final int networkTimeout = connection.getNetworkTimeout();
+         connection.setNetworkTimeout(executor, (int) timeoutMs);
+         return networkTimeout;
+      }
+      catch (SQLFeatureNotSupportedException e) {
+         IS_JDBC41 = false;
+         return 0;
+      }
   }

   /**