From e43864f62688271afb9538542e4af2eeaa61fa24 Mon Sep 17 00:00:00 2001 From: Brett Wooldridge Date: Thu, 20 Mar 2014 19:18:15 +0900 Subject: [PATCH] Pickup additional parameters from Hibernate. --- .../hikari/hibernate/HikariConfigurationUtil.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zaxxer/hikari/hibernate/HikariConfigurationUtil.java b/src/main/java/com/zaxxer/hikari/hibernate/HikariConfigurationUtil.java index bbaf1b2a..e4bba242 100644 --- a/src/main/java/com/zaxxer/hikari/hibernate/HikariConfigurationUtil.java +++ b/src/main/java/com/zaxxer/hikari/hibernate/HikariConfigurationUtil.java @@ -42,20 +42,22 @@ public class HikariConfigurationUtil @SuppressWarnings("rawtypes") public static HikariConfig loadConfiguration(Map props) { - Properties hicaryProps = new Properties(); - copyProperty(AvailableSettings.ISOLATION, props, "transactionIsolation", hicaryProps); - copyProperty(AvailableSettings.AUTOCOMMIT, props, "autoCommit", hicaryProps); + Properties hikariProps = new Properties(); + copyProperty(AvailableSettings.ISOLATION, props, "transactionIsolation", hikariProps); + copyProperty(AvailableSettings.AUTOCOMMIT, props, "autoCommit", hikariProps); + copyProperty(AvailableSettings.DRIVER, props, "driverClassName", hikariProps); + copyProperty(AvailableSettings.URL, props, "jdbcUrl", hikariProps); for (Object keyo : props.keySet()) { String key = (String) keyo; if (key.startsWith(CONFIG_PREFIX)) { - hicaryProps.setProperty(key.substring(CONFIG_PREFIX.length()), (String) props.get(key)); + hikariProps.setProperty(key.substring(CONFIG_PREFIX.length()), (String) props.get(key)); } } - return new HikariConfig(hicaryProps); + return new HikariConfig(hikariProps); } @SuppressWarnings("rawtypes")