From d9b1876c2bff0e59606b7b67c7449d28e96901d6 Mon Sep 17 00:00:00 2001 From: Brett Wooldridge Date: Fri, 26 Aug 2016 19:32:42 +0900 Subject: [PATCH] Closes #701 Ensure the exception type is the same as 2.3.x --- src/main/java/com/zaxxer/hikari/HikariConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/zaxxer/hikari/HikariConfig.java b/src/main/java/com/zaxxer/hikari/HikariConfig.java index 459a5064..030ac24e 100644 --- a/src/main/java/com/zaxxer/hikari/HikariConfig.java +++ b/src/main/java/com/zaxxer/hikari/HikariConfig.java @@ -769,7 +769,7 @@ public class HikariConfig implements HikariConfigMXBean LOGGER.error("{} - cannot use driverClassName and dataSourceClassName together.", poolName); // NOTE: This exception text is referenced by a Spring Boot FailureAnalyzer, it should not be // changed without first notifying the Spring Boot developers. - throw new IllegalArgumentException("cannot use driverClassName and dataSourceClassName together."); + throw new IllegalStateException("cannot use driverClassName and dataSourceClassName together."); } else if (jdbcUrl != null) { LOGGER.warn("{} - using dataSourceClassName and ignoring jdbcUrl.", poolName);