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

Merge branch '1.1.x'

Browse Source
This commit is contained in:
Dave Syer
2014-07-25 08:46:09 -07:00
parent cc51296397 8c15b13fda
commit 13c94172b0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot/src/main/java/org/springframework/boot/bind/PropertySourcesPropertyValues.java
View File

@@ -76,11 +76,11 @@ public class PropertySourcesPropertyValues implements PropertyValues {
.toArray(new String[0]);
String[] exacts = names == null ? new String[0] : names.toArray(new String[0]);
for (PropertySource<?> source : propertySources) {
processPropertSource(source, resolver, includes, exacts);
processPropertySource(source, resolver, includes, exacts);
}
}
private void processPropertSource(PropertySource<?> source,
private void processPropertySource(PropertySource<?> source,
PropertySourcesPropertyResolver resolver, String[] includes, String[] exacts) {
if (source instanceof EnumerablePropertySource) {
EnumerablePropertySource<?> enumerable = (EnumerablePropertySource<?>) source;
@@ -107,7 +107,7 @@ public class PropertySourcesPropertyValues implements PropertyValues {
else if (source instanceof CompositePropertySource) {
CompositePropertySource composite = (CompositePropertySource) source;
for (PropertySource<?> nested : extractSources(composite)) {
processPropertSource(nested, resolver, includes, exacts);
processPropertySource(nested, resolver, includes, exacts);
}
}
else {