Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mergePropertiesIntoMap copies non-String values as well (SPR-5669)

Browse Source
This commit is contained in:
Juergen Hoeller
2009-04-17 12:21:57 +00:00
parent c225b44f34
commit 8ee0363776
2 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
org.springframework.core/src/main/java/org/springframework/util/CollectionUtils.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2008 the original author or authors.
* Copyright 2002-2009 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -99,7 +99,12 @@ public abstract class CollectionUtils {
if (props != null) {
for (Enumeration en = props.propertyNames(); en.hasMoreElements();) {
String key = (String) en.nextElement();
map.put(key, props.getProperty(key));
Object value = props.getProperty(key);
if (value == null) {
// Potentially a non-String value...
value = props.get(key);
}
map.put(key, value);
}
}
}