fixed findPlaceholderEndIndex to work with a custom suffix as well (SPR-7574)

15 years ago · eda6268d9d
1 changed files with 1 additions and 1 deletions
--- a/org.springframework.core/src/main/java/org/springframework/util/PropertyPlaceholderHelper.java
+++ b/org.springframework.core/src/main/java/org/springframework/util/PropertyPlaceholderHelper.java
@ -190,7 +190,7 @@ public class PropertyPlaceholderHelper {
 			if (StringUtils.substringMatch(buf, index, this.placeholderSuffix)) {
 				if (withinNestedPlaceholder > 0) {
 					withinNestedPlaceholder--;
-					index = index + this.placeholderPrefix.length() - 1;
+					index = index + this.placeholderSuffix.length();
 				}
 				else {
 					return index;