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

Restored property source ordering (fixing regression from 4.0.x)

Browse Source 
Issue: SPR-12198
This commit is contained in:
Juergen Hoeller
2014-09-18 23:48:35 +02:00
parent f4219ca06b
commit 90b93ffe3f
4 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -375,8 +375,7 @@ class ConfigurationClassParser {
propertySources.addLast(propertySource);
}
else {
String firstProcessed = this.propertySourceNames.iterator().next();
propertySources.addBefore(firstProcessed, propertySource);
propertySources.addFirst(propertySource);
}
}
this.propertySourceNames.add(name);