From e9606f20685ef240571a1b4139caa204e07f02f9 Mon Sep 17 00:00:00 2001
From: NosBit <dotakias-4-@hotmail.com>
Date: Fri, 20 Dec 2013 20:19:45 +0200
Subject: [PATCH] Fixed a bug in HikariConfig.setConnectionTimeout(long) that
 was causing 0 not to be infinite.

---
 .../src/main/java/com/zaxxer/hikari/HikariConfig.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/com/zaxxer/hikari/HikariConfig.java b/core/src/main/java/com/zaxxer/hikari/HikariConfig.java
index 4c4396bb..d6011afd 100644
--- a/core/src/main/java/com/zaxxer/hikari/HikariConfig.java
+++ b/core/src/main/java/com/zaxxer/hikari/HikariConfig.java
@@ -197,15 +197,18 @@ public final class HikariConfig implements HikariConfigMBean
     /** {@inheritDoc} */
     public void setConnectionTimeout(long connectionTimeoutMs)
     {
-        if (connectionTimeoutMs < 100)
+        if (connectionTimeoutMs == 0)
+        {
+            this.connectionTimeout = Integer.MAX_VALUE;
+        }
+        else if (connectionTimeoutMs < 100)
         {
             throw new IllegalArgumentException("connectionTimeout cannot be less than 100ms");
         }
-        if (connectionTimeoutMs == 0)
+        else
         {
-            this.connectionTimeout = Integer.MAX_VALUE;
+            this.connectionTimeout = connectionTimeoutMs;
         }
-        this.connectionTimeout = connectionTimeoutMs;
     }
 
     public String getDataSourceClassName()