Fix regression in @propertysource placeholder resolution

cbeams · cbeams · commit 4df2a14b13ac · 2012-02-20T14:21:51.000+01:00
Changes in commit 41ade68 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, SPR-9127
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java
@@ -185,7 +185,7 @@ protected AnnotationMetadata doProcessConfigurationClass(
 				throw new IllegalArgumentException("At least one @PropertySource(value) location is required");
 			}
 			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();
 			if (!StringUtils.hasText(name)) {

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ protected AnnotationMetadata doProcessConfigurationClass(`
`185`	`185`	`throw new IllegalArgumentException("At least one @PropertySource(value) location is required");`
`186`	`186`	`}`
`187`	`187`	`for (int i = 0; i < nLocations; i++) {`
`188`		`- locations[0] = this.environment.resolveRequiredPlaceholders(locations[0]);`
	`188`	`+ locations[i] = this.environment.resolveRequiredPlaceholders(locations[i]);`
`189`	`189`	`}`
`190`	`190`	`ClassLoader classLoader = this.resourceLoader.getClassLoader();`
`191`	`191`	`if (!StringUtils.hasText(name)) {`