From 37e24d630a2ee309f52c56ae4f7e2ef93a607626 Mon Sep 17 00:00:00 2001 From: Brett Wooldridge Date: Thu, 6 Nov 2014 09:03:28 +0900 Subject: [PATCH] Fix #176 take the timeout value at face-value --- .../src/main/java/com/zaxxer/hikari/util/PoolUtilities.java | 2 +- .../src/main/java/com/zaxxer/hikari/util/PoolUtilities.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hikaricp-java6/src/main/java/com/zaxxer/hikari/util/PoolUtilities.java b/hikaricp-java6/src/main/java/com/zaxxer/hikari/util/PoolUtilities.java index c3dc8a51..5a97a7f3 100644 --- a/hikaricp-java6/src/main/java/com/zaxxer/hikari/util/PoolUtilities.java +++ b/hikaricp-java6/src/main/java/com/zaxxer/hikari/util/PoolUtilities.java @@ -296,7 +296,7 @@ public final class PoolUtilities } final int networkTimeout = connection.getNetworkTimeout(); - connection.setNetworkTimeout(executor, Math.max(250, (int) timeoutMs)); + connection.setNetworkTimeout(executor, (int) timeoutMs); return networkTimeout; } diff --git a/hikaricp/src/main/java/com/zaxxer/hikari/util/PoolUtilities.java b/hikaricp/src/main/java/com/zaxxer/hikari/util/PoolUtilities.java index 9d10016c..b04e72d8 100644 --- a/hikaricp/src/main/java/com/zaxxer/hikari/util/PoolUtilities.java +++ b/hikaricp/src/main/java/com/zaxxer/hikari/util/PoolUtilities.java @@ -269,7 +269,7 @@ public final class PoolUtilities } final int networkTimeout = connection.getNetworkTimeout(); - connection.setNetworkTimeout(executor, Math.max(250, (int) timeoutMs)); + connection.setNetworkTimeout(executor, (int) timeoutMs); return networkTimeout; }