From eda6268d9deed787b3b656843ed5fad02c7b15f1 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Wed, 29 Sep 2010 14:01:54 +0000
Subject: [PATCH] fixed findPlaceholderEndIndex to work with a custom suffix as
 well (SPR-7574)

---
 .../org/springframework/util/PropertyPlaceholderHelper.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 9ec877213f..4b1b2c37b1 100644
--- 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;