Fix #163 validation was incorrect

11 years ago · be99efba1d
parent ca9b82970c
commit be99efba1d
2 changed files with 2 additions and 2 deletions
--- 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) {
--- 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) {