diff --git a/hikaricp-java6/src/main/java/com/zaxxer/hikari/util/PoolUtilities.java b/hikaricp-java6/src/main/java/com/zaxxer/hikari/util/PoolUtilities.java index 89d65d9f..fba67e2a 100644 --- a/hikaricp-java6/src/main/java/com/zaxxer/hikari/util/PoolUtilities.java +++ b/hikaricp-java6/src/main/java/com/zaxxer/hikari/util/PoolUtilities.java @@ -265,8 +265,7 @@ public final class PoolUtilities jdbc41checked = true; try { - connection.getNetworkTimeout(); // This will throw AbstractMethodError or SQLException in the case of a non-JDBC 41 compliant driver - IS_JDBC41 = true; + IS_JDBC41 = connection.getNetworkTimeout() != Integer.MIN_VALUE; // This will throw AbstractMethodError or SQLException in the case of a non-JDBC 41 compliant driver } catch (SQLFeatureNotSupportedException e) { IS_JDBC41 = false; @@ -329,6 +328,12 @@ public final class PoolUtilities catch (SQLFeatureNotSupportedException e) { IS_JDBC41 = false; } + catch (AbstractMethodError e) { + IS_JDBC41 = false; + } + catch (NoSuchMethodError e) { + IS_JDBC41 = false; + } } return 0; diff --git a/hikaricp/src/main/java/com/zaxxer/hikari/util/PoolUtilities.java b/hikaricp/src/main/java/com/zaxxer/hikari/util/PoolUtilities.java index c309db71..01315268 100644 --- a/hikaricp/src/main/java/com/zaxxer/hikari/util/PoolUtilities.java +++ b/hikaricp/src/main/java/com/zaxxer/hikari/util/PoolUtilities.java @@ -241,8 +241,7 @@ public final class PoolUtilities jdbc41checked = true; try { - connection.getNetworkTimeout(); // This will throw AbstractMethodError or SQLException in the case of a non-JDBC 41 compliant driver - IS_JDBC41 = true; + IS_JDBC41 = connection.getNetworkTimeout() != Integer.MIN_VALUE; // This will throw AbstractMethodError or SQLException in the case of a non-JDBC 41 compliant driver } catch (NoSuchMethodError | AbstractMethodError | SQLFeatureNotSupportedException e) { IS_JDBC41 = false; @@ -290,7 +289,7 @@ public final class PoolUtilities connection.setNetworkTimeout(executor, (int) timeoutMs); return networkTimeout; } - catch (SQLFeatureNotSupportedException e) { + catch (SQLFeatureNotSupportedException | AbstractMethodError | NoSuchMethodError e) { IS_JDBC41 = false; } }