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

Further refine property source ordering

Browse Source 
Refine property source ordering so that sources already contained in the
environment remain before those added by @PropertySource annotations.

Issue: SPR-12198
This commit is contained in:
Phillip Webb
2014-09-19 00:07:30 -07:00
parent e71fbb9f46
commit a2b983a4e4
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java
View File

@@ -128,7 +128,7 @@ class ConfigurationClassParser {
private final Map<String, ConfigurationClass> knownSuperclasses = new HashMap<String, ConfigurationClass>();
private final Set<String> propertySourceNames = new LinkedHashSet<String>();
private final List<String> propertySourceNames = new ArrayList<String>();
private final ImportStack importStack = new ImportStack();
@@ -375,7 +375,8 @@ class ConfigurationClassParser {
propertySources.addLast(propertySource);
}
else {
propertySources.addFirst(propertySource);
String firstProcessed = this.propertySourceNames.get(this.propertySourceNames.size()-1);
propertySources.addBefore(firstProcessed, propertySource);
}
}
this.propertySourceNames.add(name);