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

pull/190/head
Brett Wooldridge 10 years ago
parent 6758ae4447
commit 2fdf515164

@ -21,8 +21,8 @@ import java.beans.IntrospectionException;
import java.beans.Introspector; import java.beans.Introspector;
import java.beans.PropertyDescriptor; import java.beans.PropertyDescriptor;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.Enumeration;
import java.util.HashSet; import java.util.HashSet;
import java.util.Map.Entry;
import java.util.Properties; import java.util.Properties;
import java.util.Set; import java.util.Set;
@ -46,9 +46,10 @@ public final class PropertyBeanSetter
return; return;
} }
for (Entry<Object, Object> propEntry : properties.entrySet()) { Enumeration<?> propertyNames = properties.propertyNames();
String propName = propEntry.getKey().toString(); while (propertyNames.hasMoreElements()) {
Object propValue = propEntry.getValue(); String propName = propertyNames.nextElement().toString();
Object propValue = properties.getProperty(propName);
if (target instanceof HikariConfig && propName.startsWith("dataSource.")) { if (target instanceof HikariConfig && propName.startsWith("dataSource.")) {
HikariConfig config = (HikariConfig) target; HikariConfig config = (HikariConfig) target;

@ -21,8 +21,8 @@ import java.beans.IntrospectionException;
import java.beans.Introspector; import java.beans.Introspector;
import java.beans.PropertyDescriptor; import java.beans.PropertyDescriptor;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.Enumeration;
import java.util.HashSet; import java.util.HashSet;
import java.util.Map.Entry;
import java.util.Properties; import java.util.Properties;
import java.util.Set; import java.util.Set;
@ -46,9 +46,10 @@ public final class PropertyBeanSetter
return; return;
} }
for (Entry<Object, Object> propEntry : properties.entrySet()) { Enumeration<?> propertyNames = properties.propertyNames();
String propName = propEntry.getKey().toString(); while (propertyNames.hasMoreElements()) {
Object propValue = propEntry.getValue(); String propName = propertyNames.nextElement().toString();
Object propValue = properties.getProperty(propName);
if (target instanceof HikariConfig && propName.startsWith("dataSource.")) { if (target instanceof HikariConfig && propName.startsWith("dataSource.")) {
HikariConfig config = (HikariConfig) target; HikariConfig config = (HikariConfig) target;

Loading…
Cancel
Save