From 5b6d846a3c9a0e6d8f256c072ea41c89f11c6aec Mon Sep 17 00:00:00 2001 From: Brett Wooldridge Date: Sat, 8 Nov 2014 13:07:46 +0900 Subject: [PATCH] Remove calls to getConnectionTimeout(), rely on the member variable which is refreshed every 30 seconds. --- .../src/main/java/com/zaxxer/hikari/pool/HikariPool.java | 5 ++--- .../src/main/java/com/zaxxer/hikari/pool/HikariPool.java | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/hikaricp-java6/src/main/java/com/zaxxer/hikari/pool/HikariPool.java b/hikaricp-java6/src/main/java/com/zaxxer/hikari/pool/HikariPool.java index a1a02e2e..c1e24149 100644 --- a/hikaricp-java6/src/main/java/com/zaxxer/hikari/pool/HikariPool.java +++ b/hikaricp-java6/src/main/java/com/zaxxer/hikari/pool/HikariPool.java @@ -147,7 +147,7 @@ public final class HikariPool implements HikariPoolMBean, IBagStateListener this.dataSource = initializeDataSource(configuration.getDataSourceClassName(), configuration.getDataSource(), configuration.getDataSourceProperties(), configuration.getJdbcUrl(), username, password); - setLoginTimeout(dataSource, configuration.getConnectionTimeout(), LOGGER); + setLoginTimeout(dataSource, connectionTimeout, LOGGER); registerMBeans(configuration, this); @@ -419,7 +419,6 @@ public final class HikariPool implements HikariPoolMBean, IBagStateListener try { connection = (username == null && password == null) ? dataSource.getConnection() : dataSource.getConnection(username, password); - final long connectionTimeout = configuration.getConnectionTimeout(); isUseNetworkTimeout = isJdbc41Compliant(connection) && (connectionTimeout != Integer.MAX_VALUE); isUseJdbc4Validation = isJdbc40Compliant(connection) && configuration.getConnectionTestQuery() == null; if (!isUseJdbc4Validation && configuration.getConnectionTestQuery() == null) { @@ -461,7 +460,7 @@ public final class HikariPool implements HikariPoolMBean, IBagStateListener private boolean isConnectionAlive(final Connection connection, final long timeoutMs) { try { - final boolean timeoutEnabled = (configuration.getConnectionTimeout() != Integer.MAX_VALUE); + final boolean timeoutEnabled = (connectionTimeout != Integer.MAX_VALUE); int timeoutSec = timeoutEnabled ? (int) Math.max(1L, TimeUnit.MILLISECONDS.toSeconds(timeoutMs)) : 0; if (isUseJdbc4Validation) { diff --git a/hikaricp/src/main/java/com/zaxxer/hikari/pool/HikariPool.java b/hikaricp/src/main/java/com/zaxxer/hikari/pool/HikariPool.java index 46eea93b..2c2e2510 100644 --- a/hikaricp/src/main/java/com/zaxxer/hikari/pool/HikariPool.java +++ b/hikaricp/src/main/java/com/zaxxer/hikari/pool/HikariPool.java @@ -146,7 +146,7 @@ public final class HikariPool implements HikariPoolMBean, IBagStateListener this.dataSource = initializeDataSource(configuration.getDataSourceClassName(), configuration.getDataSource(), configuration.getDataSourceProperties(), configuration.getJdbcUrl(), username, password); - setLoginTimeout(dataSource, configuration.getConnectionTimeout(), LOGGER); + setLoginTimeout(dataSource, connectionTimeout, LOGGER); registerMBeans(configuration, this); @@ -399,7 +399,6 @@ public final class HikariPool implements HikariPoolMBean, IBagStateListener try { connection = (username == null && password == null) ? dataSource.getConnection() : dataSource.getConnection(username, password); - final long connectionTimeout = configuration.getConnectionTimeout(); isUseNetworkTimeout = isJdbc41Compliant(connection) && (connectionTimeout != Integer.MAX_VALUE); isUseJdbc4Validation = isJdbc40Compliant(connection) && configuration.getConnectionTestQuery() == null; if (!isUseJdbc4Validation && configuration.getConnectionTestQuery() == null) { @@ -441,7 +440,7 @@ public final class HikariPool implements HikariPoolMBean, IBagStateListener private boolean isConnectionAlive(final Connection connection, final long timeoutMs) { try { - final boolean timeoutEnabled = (configuration.getConnectionTimeout() != Integer.MAX_VALUE); + final boolean timeoutEnabled = (connectionTimeout != Integer.MAX_VALUE); int timeoutSec = timeoutEnabled ? (int) Math.max(1L, TimeUnit.MILLISECONDS.toSeconds(timeoutMs)) : 0; if (isUseJdbc4Validation) {