From 949bff3997eb162883c141769b3d2b7704ea3f85 Mon Sep 17 00:00:00 2001 From: Brett Wooldridge Date: Sat, 22 Nov 2014 22:50:16 +0900 Subject: [PATCH] Even cleaner connection test check. --- .../src/main/java/com/zaxxer/hikari/pool/HikariPool.java | 3 ++- hikaricp/src/main/java/com/zaxxer/hikari/pool/HikariPool.java | 3 ++- 2 files changed, 4 insertions(+), 2 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 fdecc0e1..c98b8c40 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 @@ -443,8 +443,9 @@ public final class HikariPool implements HikariPoolMBean, IBagStateListener try { connection = (username == null && password == null) ? dataSource.getConnection() : dataSource.getConnection(username, password); - if (configuration.getConnectionTestQuery() == null && !(isUseJdbc4Validation &= isJdbc40Compliant(connection))) { + if (isUseJdbc4Validation && !isJdbc40Compliant(connection)) { LOGGER.error("JDBC4 Connection.isValid() method not supported, connection test query must be configured"); + return true; } final boolean timeoutEnabled = (connectionTimeout != Integer.MAX_VALUE); 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 0f3e140f..04125971 100644 --- a/hikaricp/src/main/java/com/zaxxer/hikari/pool/HikariPool.java +++ b/hikaricp/src/main/java/com/zaxxer/hikari/pool/HikariPool.java @@ -423,8 +423,9 @@ public final class HikariPool implements HikariPoolMBean, IBagStateListener try { connection = (username == null && password == null) ? dataSource.getConnection() : dataSource.getConnection(username, password); - if (configuration.getConnectionTestQuery() == null && !(isUseJdbc4Validation &= isJdbc40Compliant(connection))) { + if (isUseJdbc4Validation && !isJdbc40Compliant(connection)) { LOGGER.error("JDBC4 Connection.isValid() method not supported, connection test query must be configured"); + return true; } final boolean timeoutEnabled = (connectionTimeout != Integer.MAX_VALUE);