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

jhoeller · jhoeller · commit eda6268d9dee · 2010-09-29T14:01:54.000Z
diff --git 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 @@ private int findPlaceholderEndIndex(CharSequence buf, int startIndex) {
 			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;

Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ private int findPlaceholderEndIndex(CharSequence buf, int startIndex) {`
`190`	`190`	`if (StringUtils.substringMatch(buf, index, this.placeholderSuffix)) {`
`191`	`191`	`if (withinNestedPlaceholder > 0) {`
`192`	`192`	`withinNestedPlaceholder--;`
`193`		`- index = index + this.placeholderPrefix.length() - 1;`
	`193`	`+ index = index + this.placeholderSuffix.length();`
`194`	`194`	`}`
`195`	`195`	`else {`
`196`	`196`	`return index;`