Closes #701 Ensure the exception type is the same as 2.3.x

pull/882/head
Brett Wooldridge 9 years ago
parent 7c1b2a15c0
commit d9b1876c2b

@ -769,7 +769,7 @@ public class HikariConfig implements HikariConfigMXBean
LOGGER.error("{} - cannot use driverClassName and dataSourceClassName together.", poolName); LOGGER.error("{} - cannot use driverClassName and dataSourceClassName together.", poolName);
// NOTE: This exception text is referenced by a Spring Boot FailureAnalyzer, it should not be // NOTE: This exception text is referenced by a Spring Boot FailureAnalyzer, it should not be
// changed without first notifying the Spring Boot developers. // 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) { else if (jdbcUrl != null) {
LOGGER.warn("{} - using dataSourceClassName and ignoring jdbcUrl.", poolName); LOGGER.warn("{} - using dataSourceClassName and ignoring jdbcUrl.", poolName);

Loading…
Cancel
Save