Merge pull request #190 from openwide-java/fix-properties-copy

Fix copy of properties when using a jdbc url.
10 years ago · df9821759f
parent e3093d76a1 2b1e0f77bb
commit df9821759f
2 changed files with 4 additions and 2 deletions
--- 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));
         }
--- 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));
         }