Comment #25 added additional warning if both dataSource and dataSourceClassName are specified.

11 years ago · 7235091496
parent f79af53fb6
commit 7235091496
1 changed files with 4 additions and 0 deletions
--- a/src/main/java/com/zaxxer/hikari/HikariConfig.java
+++ b/src/main/java/com/zaxxer/hikari/HikariConfig.java
@ -416,6 +416,10 @@ public final class HikariConfig implements HikariConfigMBean
            logger.error("one of either dataSource or dataSourceClassName must be specified");
            throw new IllegalStateException("one of either dataSource or dataSourceClassName must be specified");
        }
+        else if (dataSource != null && dataSourceClassName != null)
+        {
+            logger.warn("both dataSource and dataSourceClassName are specified, ignoring dataSourceClassName");
+        }

        if (idleTimeout < 0)
        {