From be99efba1db6765c6b1bfb996025a408ecafd0a8 Mon Sep 17 00:00:00 2001 From: Brett Wooldridge Date: Tue, 21 Oct 2014 14:16:56 +0900 Subject: [PATCH] Fix #163 validation was incorrect --- .../src/main/java/com/zaxxer/hikari/HikariConfig.java | 2 +- hikaricp/src/main/java/com/zaxxer/hikari/HikariConfig.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hikaricp-java6/src/main/java/com/zaxxer/hikari/HikariConfig.java b/hikaricp-java6/src/main/java/com/zaxxer/hikari/HikariConfig.java index bc17c20d..c678705d 100644 --- a/hikaricp-java6/src/main/java/com/zaxxer/hikari/HikariConfig.java +++ b/hikaricp-java6/src/main/java/com/zaxxer/hikari/HikariConfig.java @@ -668,7 +668,7 @@ public class HikariConfig implements HikariConfigMBean logger.error("both driverClassName and dataSourceClassName are specified, one or the other should be used"); throw new IllegalStateException("both driverClassName and dataSourceClassName are specified, one or the other should be used"); } - else if (driverClassName != null && jdbcUrl != null) { + else if (jdbcUrl != null) { // OK } else if (dataSource == null && dataSourceClassName == null) { diff --git a/hikaricp/src/main/java/com/zaxxer/hikari/HikariConfig.java b/hikaricp/src/main/java/com/zaxxer/hikari/HikariConfig.java index cdedb57b..10909d9a 100644 --- a/hikaricp/src/main/java/com/zaxxer/hikari/HikariConfig.java +++ b/hikaricp/src/main/java/com/zaxxer/hikari/HikariConfig.java @@ -668,7 +668,7 @@ public class HikariConfig implements HikariConfigMBean logger.error("both driverClassName and dataSourceClassName are specified, one or the other should be used"); throw new IllegalStateException("both driverClassName and dataSourceClassName are specified, one or the other should be used"); } - else if (driverClassName != null && jdbcUrl != null) { + else if (jdbcUrl != null) { // OK } else if (dataSource == null && dataSourceClassName == null) {