From 89b3ce00ee929a94ba6de9d1dcb059ef4e80429b Mon Sep 17 00:00:00 2001 From: Brett Wooldridge Date: Sat, 18 Oct 2014 14:14:45 +0900 Subject: [PATCH] Fixed#163 do not require driver class name when JDBC URL is specified, newer drivers following the service registration model will be automatically located by the DriverManager. --- .../src/main/java/com/zaxxer/hikari/HikariConfig.java | 4 ---- hikaricp/src/main/java/com/zaxxer/hikari/HikariConfig.java | 4 ---- 2 files changed, 8 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 e63e5773..b4ac8b6b 100644 --- a/hikaricp-java6/src/main/java/com/zaxxer/hikari/HikariConfig.java +++ b/hikaricp-java6/src/main/java/com/zaxxer/hikari/HikariConfig.java @@ -664,10 +664,6 @@ public class HikariConfig implements HikariConfigMBean logger.error("when specifying driverClassName, jdbcUrl must also be specified"); throw new IllegalStateException("when specifying driverClassName, jdbcUrl must also be specified"); } - else if (jdbcUrl != null && driverClassName == null) { - logger.error("when specifying jdbcUrl, driverClassName must also be specified"); - throw new IllegalStateException("when specifying jdbcUrl, driverClassName must also be specified"); - } else if (driverClassName != null && dataSourceClassName != null) { 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"); diff --git a/hikaricp/src/main/java/com/zaxxer/hikari/HikariConfig.java b/hikaricp/src/main/java/com/zaxxer/hikari/HikariConfig.java index 9ef1d58c..353a438c 100644 --- a/hikaricp/src/main/java/com/zaxxer/hikari/HikariConfig.java +++ b/hikaricp/src/main/java/com/zaxxer/hikari/HikariConfig.java @@ -664,10 +664,6 @@ public class HikariConfig implements HikariConfigMBean logger.error("when specifying driverClassName, jdbcUrl must also be specified"); throw new IllegalStateException("when specifying driverClassName, jdbcUrl must also be specified"); } - else if (jdbcUrl != null && driverClassName == null) { - logger.error("when specifying jdbcUrl, driverClassName must also be specified"); - throw new IllegalStateException("when specifying jdbcUrl, driverClassName must also be specified"); - } else if (driverClassName != null && dataSourceClassName != null) { 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");