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

Merge branch '6.2.x'

Browse Source
This commit is contained in:
Stéphane Nicoll
2024-12-23 12:31:31 +01:00
parent bccd9e9f11 5ce5647d09
commit 950d0b5164
2 changed files with 43 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-core/src/main/java/org/springframework/util/PlaceholderParser.java
View File

@@ -512,7 +512,7 @@ final class PlaceholderParser {
@Override
public String resolve(PartResolutionContext resolutionContext) {
String value = resolveRecursively(resolutionContext, this.key);
String value = resolveRecursively(resolutionContext);
if (value != null) {
return value;
}
@@ -521,6 +521,17 @@ final class PlaceholderParser {
}
return resolutionContext.handleUnresolvablePlaceholder(this.key, text());
}
@Nullable
private String resolveRecursively(PartResolutionContext resolutionContext) {
if (!this.text().equals(this.key)) {
String value = resolveRecursively(resolutionContext, this.text());
if (value != null) {
return value;
}
}
return resolveRecursively(resolutionContext, this.key);
}
}