Fix #183 use propertyNames() enumeration to ensure picking up default properties.

10 years ago · 5880aac801
parent 5b6d846a3c
commit 5880aac801
2 changed files with 10 additions and 2 deletions
--- a/hikaricp-java6/src/main/java/com/zaxxer/hikari/util/PropertyBeanSetter.java
+++ b/hikaricp-java6/src/main/java/com/zaxxer/hikari/util/PropertyBeanSetter.java
@ -48,8 +48,12 @@ public final class PropertyBeanSetter

      Enumeration<?> propertyNames = properties.propertyNames();
      while (propertyNames.hasMoreElements()) {
-         String propName = propertyNames.nextElement().toString();
+         Object key = propertyNames.nextElement();
+         String propName = key.toString();
         Object propValue = properties.getProperty(propName);
+         if (propValue == null) {
+            propValue = properties.get(key);
+         }

         if (target instanceof HikariConfig && propName.startsWith("dataSource.")) {
            HikariConfig config = (HikariConfig) target;
--- a/hikaricp/src/main/java/com/zaxxer/hikari/util/PropertyBeanSetter.java
+++ b/hikaricp/src/main/java/com/zaxxer/hikari/util/PropertyBeanSetter.java
@ -48,8 +48,12 @@ public final class PropertyBeanSetter

      Enumeration<?> propertyNames = properties.propertyNames();
      while (propertyNames.hasMoreElements()) {
-         String propName = propertyNames.nextElement().toString();
+         Object key = propertyNames.nextElement();
+         String propName = key.toString();
         Object propValue = properties.getProperty(propName);
+         if (propValue == null) {
+            propValue = properties.get(key);
+         }

         if (target instanceof HikariConfig && propName.startsWith("dataSource.")) {
            HikariConfig config = (HikariConfig) target;