From d4d6d759deb44333b7dacb5b1ef20a1d048759d2 Mon Sep 17 00:00:00 2001 From: Brett Wooldridge Date: Thu, 28 Jan 2016 23:05:56 +0900 Subject: [PATCH] Issue #547 Decreased allowable minimum connectionTimeout and validationTimeout to 250ms. --- src/main/java/com/zaxxer/hikari/HikariConfig.java | 8 ++++---- src/test/java/com/zaxxer/hikari/pool/TestValidation.java | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zaxxer/hikari/HikariConfig.java b/src/main/java/com/zaxxer/hikari/HikariConfig.java index ffeaaff0..98dbb565 100644 --- a/src/main/java/com/zaxxer/hikari/HikariConfig.java +++ b/src/main/java/com/zaxxer/hikari/HikariConfig.java @@ -236,8 +236,8 @@ public class HikariConfig implements HikariConfigMXBean if (connectionTimeoutMs == 0) { this.connectionTimeout = Integer.MAX_VALUE; } - else if (connectionTimeoutMs < 1000) { - throw new IllegalArgumentException("connectionTimeout cannot be less than 1000ms"); + else if (connectionTimeoutMs < 250) { + throw new IllegalArgumentException("connectionTimeout cannot be less than 250ms"); } else { this.connectionTimeout = connectionTimeoutMs; @@ -259,8 +259,8 @@ public class HikariConfig implements HikariConfigMXBean @Override public void setValidationTimeout(long validationTimeoutMs) { - if (validationTimeoutMs < 1000) { - throw new IllegalArgumentException("validationTimeout cannot be less than 1000ms"); + if (validationTimeoutMs < 250) { + throw new IllegalArgumentException("validationTimeout cannot be less than 250ms"); } else { this.validationTimeout = validationTimeoutMs; diff --git a/src/test/java/com/zaxxer/hikari/pool/TestValidation.java b/src/test/java/com/zaxxer/hikari/pool/TestValidation.java index e837ce19..f5214f8b 100644 --- a/src/test/java/com/zaxxer/hikari/pool/TestValidation.java +++ b/src/test/java/com/zaxxer/hikari/pool/TestValidation.java @@ -23,7 +23,6 @@ import org.junit.Assert; import org.junit.Test; import com.zaxxer.hikari.HikariConfig; -import com.zaxxer.hikari.mocks.StubDataSource; /** * @author Brett Wooldridge @@ -115,7 +114,7 @@ public class TestValidation Assert.fail(); } 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")); } }