root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Polished "Could not resolve placeholder" error message

This commit is contained in:
Juergen Hoeller 2012-10-31 02:19:23 +01:00 committed by unknown
parent 69763fe249
commit ee50d849a1
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-core/src/main/java/org/springframework/util/PropertyPlaceholderHelper.java
View File

@ -142,7 +142,6 @@ public class PropertyPlaceholderHelper {
} }
// Recursive invocation, parsing placeholders contained in the placeholder key. // Recursive invocation, parsing placeholders contained in the placeholder key.
placeholder = parseStringValue(placeholder, placeholderResolver, visitedPlaceholders); placeholder = parseStringValue(placeholder, placeholderResolver, visitedPlaceholders);
// Now obtain the value for the fully resolved key... // Now obtain the value for the fully resolved key...
String propVal = placeholderResolver.resolvePlaceholder(placeholder); String propVal = placeholderResolver.resolvePlaceholder(placeholder);
if (propVal == null && this.valueSeparator != null) { if (propVal == null && this.valueSeparator != null) {
@ -172,9 +171,8 @@ public class PropertyPlaceholderHelper {
} }
else { else {
throw new IllegalArgumentException("Could not resolve placeholder '" + throw new IllegalArgumentException("Could not resolve placeholder '" +
placeholder + "'" + " in string value [" + strVal + "]"); placeholder + "'" + " in string value \"" + strVal + "\"");
} }
visitedPlaceholders.remove(originalPlaceholder); visitedPlaceholders.remove(originalPlaceholder);
} }
else { else {