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

Fix regression in @PropertySource placeholder resolution

Browse Source 
Changes in commit 41ade68b50 introduced
a regression causing all but the first location in the
@PropertySource#value array to be ignored during ${...} placeholder
resolution. This change ensures that all locations are processed and
replaced as expected.

Issue: SPR-9133
Backport-Issue: SPR-9127
Backport-Commit: 4df2a14b13
This commit is contained in:
Chris Beams
2012-02-20 14:21:51 +01:00
parent 129b4b3136
commit e30d6104f3
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java
View File

@@ -185,7 +185,7 @@ class ConfigurationClassParser {
throw new IllegalArgumentException("At least one @PropertySource(value) location is required"); throw new IllegalArgumentException("At least one @PropertySource(value) location is required");
} }
for (int i = 0; i < nLocations; i++) { for (int i = 0; i < nLocations; i++) {
locations[0] = this.environment.resolveRequiredPlaceholders(locations[0]); locations[i] = this.environment.resolveRequiredPlaceholders(locations[i]);
} }
ClassLoader classLoader = this.resourceLoader.getClassLoader(); ClassLoader classLoader = this.resourceLoader.getClassLoader();
if (!StringUtils.hasText(name)) { if (!StringUtils.hasText(name)) {