From db0231ee5b4bdafcf4e87b00ed1a75fbed134d74 Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Thu, 13 Nov 2014 19:21:46 +0100 Subject: [PATCH] Fix copy of properties when using a jdbc url. Constructor Properties(Properties properties) is not a copy constructor. --- .../src/main/java/com/zaxxer/hikari/util/DriverDataSource.java | 3 ++- .../src/main/java/com/zaxxer/hikari/util/DriverDataSource.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hikaricp-java6/src/main/java/com/zaxxer/hikari/util/DriverDataSource.java b/hikaricp-java6/src/main/java/com/zaxxer/hikari/util/DriverDataSource.java index 7f3f199d..65a4ded1 100644 --- a/hikaricp-java6/src/main/java/com/zaxxer/hikari/util/DriverDataSource.java +++ b/hikaricp-java6/src/main/java/com/zaxxer/hikari/util/DriverDataSource.java @@ -35,7 +35,8 @@ public final class DriverDataSource implements DataSource { try { this.jdbcUrl = jdbcUrl; - this.driverProperties = new Properties(properties); + this.driverProperties = new Properties(); + this.driverProperties.putAll(properties); if (username != null) { driverProperties.put("user", driverProperties.getProperty("user", username)); } diff --git a/hikaricp/src/main/java/com/zaxxer/hikari/util/DriverDataSource.java b/hikaricp/src/main/java/com/zaxxer/hikari/util/DriverDataSource.java index 7f3f199d..65a4ded1 100644 --- a/hikaricp/src/main/java/com/zaxxer/hikari/util/DriverDataSource.java +++ b/hikaricp/src/main/java/com/zaxxer/hikari/util/DriverDataSource.java @@ -35,7 +35,8 @@ public final class DriverDataSource implements DataSource { try { this.jdbcUrl = jdbcUrl; - this.driverProperties = new Properties(properties); + this.driverProperties = new Properties(); + this.driverProperties.putAll(properties); if (username != null) { driverProperties.put("user", driverProperties.getProperty("user", username)); }