Merge pull request #14 from NosBit/dev

Fixed a bug in HikariConfig.setConnectionTimeout(long)

core/src/main/java/com/zaxxer/hikari/HikariConfig.java

@@ -197,16 +197,19 @@ public final class HikariConfig implements HikariConfigMBean
     /** {@inheritDoc} */
     public void setConnectionTimeout(long connectionTimeoutMs)
     {
-        if (connectionTimeoutMs < 100)
-        {
-            throw new IllegalArgumentException("connectionTimeout cannot be less than 100ms");
-        }
         if (connectionTimeoutMs == 0)
         {
             this.connectionTimeout = Integer.MAX_VALUE;
         }
+        else if (connectionTimeoutMs < 100)
+        {
+            throw new IllegalArgumentException("connectionTimeout cannot be less than 100ms");
+        }
+        else
+        {
             this.connectionTimeout = connectionTimeoutMs;
         }
+    }
 
     public String getDataSourceClassName()
     {