Do not set query timeout when user specifies connectionTimeout of 0.

11 years ago · 430c6a4d56
parent 5e6da1254b
commit 430c6a4d56
1 changed files with 4 additions and 1 deletions
--- a/src/main/java/com/zaxxer/hikari/HikariPool.java
+++ b/src/main/java/com/zaxxer/hikari/HikariPool.java
@ -386,7 +386,10 @@ public final class HikariPool implements HikariPoolMBean, IBagStateListener
                Statement statement = connection.createStatement();
                try
                {
-                    statement.setQueryTimeout((int) TimeUnit.MILLISECONDS.toSeconds(timeoutMs));
+                    if (timeoutMs < Integer.MAX_VALUE)
+                    {
+                        statement.setQueryTimeout((int) TimeUnit.MILLISECONDS.toSeconds(timeoutMs));
+                    }
                    statement.executeQuery(configuration.getConnectionTestQuery());
                }
                finally