From 7cbdb602a2fab99367d4551027ccd4f355a2a9b9 Mon Sep 17 00:00:00 2001 From: Nitin Date: Wed, 18 Nov 2015 20:04:57 +0530 Subject: [PATCH] check and throw exceptions as before --- src/main/java/com/zaxxer/hikari/HikariConfig.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zaxxer/hikari/HikariConfig.java b/src/main/java/com/zaxxer/hikari/HikariConfig.java index b6fa46bc..d164dab0 100644 --- a/src/main/java/com/zaxxer/hikari/HikariConfig.java +++ b/src/main/java/com/zaxxer/hikari/HikariConfig.java @@ -767,13 +767,21 @@ public class HikariConfig implements HikariConfigMXBean } if (dataSource != null) { - LOGGER.debug("{} - using dataSource={}", poolName, dataSource); + LOGGER.info("{} - using dataSource={}", poolName, dataSource); } else if (dataSourceClassName != null) { - LOGGER.debug("{} - using dataSourceClassName={}", poolName, dataSourceClassName); + if (driverClassName != null) { + LOGGER.error("cannot use driverClassName and dataSourceClassName together"); + throw new IllegalArgumentException("cannot use driverClassName and dataSourceClassName together"); + } + LOGGER.info("{} - using dataSourceClassName={}", poolName, dataSourceClassName); } else if (jdbcUrl != null) { - LOGGER.debug("{} - using url={}, driverClassName={}", poolName, jdbcUrl, driverClassName); + LOGGER.info("{} - using url={}, driverClassName={}", poolName, jdbcUrl, driverClassName); + } + else if (driverClassName != null) { + LOGGER.error("jdbcUrl is required with driverClassName"); + throw new IllegalArgumentException("jdbcUrl is required with driverClassName"); } else { LOGGER.error("{} - dataSource or dataSourceClassName or jdbcUrl is required.", poolName);