Issue #547 Decreased allowable minimum connectionTimeout and validationTimeout to 250ms.

pull/564/head
Brett Wooldridge 9 years ago
parent bd7e3ba6db
commit d4d6d759de

@ -236,8 +236,8 @@ public class HikariConfig implements HikariConfigMXBean
if (connectionTimeoutMs == 0) { if (connectionTimeoutMs == 0) {
this.connectionTimeout = Integer.MAX_VALUE; this.connectionTimeout = Integer.MAX_VALUE;
} }
else if (connectionTimeoutMs < 1000) { else if (connectionTimeoutMs < 250) {
throw new IllegalArgumentException("connectionTimeout cannot be less than 1000ms"); throw new IllegalArgumentException("connectionTimeout cannot be less than 250ms");
} }
else { else {
this.connectionTimeout = connectionTimeoutMs; this.connectionTimeout = connectionTimeoutMs;
@ -259,8 +259,8 @@ public class HikariConfig implements HikariConfigMXBean
@Override @Override
public void setValidationTimeout(long validationTimeoutMs) public void setValidationTimeout(long validationTimeoutMs)
{ {
if (validationTimeoutMs < 1000) { if (validationTimeoutMs < 250) {
throw new IllegalArgumentException("validationTimeout cannot be less than 1000ms"); throw new IllegalArgumentException("validationTimeout cannot be less than 250ms");
} }
else { else {
this.validationTimeout = validationTimeoutMs; this.validationTimeout = validationTimeoutMs;

@ -23,7 +23,6 @@ import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariConfig;
import com.zaxxer.hikari.mocks.StubDataSource;
/** /**
* @author Brett Wooldridge * @author Brett Wooldridge
@ -115,7 +114,7 @@ public class TestValidation
Assert.fail(); Assert.fail();
} }
catch (IllegalArgumentException ise) { catch (IllegalArgumentException ise) {
Assert.assertTrue(ise.getMessage().contains("connectionTimeout cannot be less than 1000ms")); Assert.assertTrue(ise.getMessage().contains("connectionTimeout cannot be less than 250ms"));
} }
} }

Loading…
Cancel
Save