svn commit: r1506151 - /ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java

[adrianc]

Author: adrianc
Date: Tue Jul 23 16:41:02 2013
New Revision: 1506151

URL: http://svn.apache.org/r1506151
Log:
Improved the parsing logic in FlexibleStringExpander.java.

Modified:
    ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java?rev=1506151&r1=1506150&r2=1506151&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java Tue Jul 23 16:41:02 2013
@@ -320,10 +320,10 @@ public abstract class FlexibleStringExpa
                 strElems.add(new ScriptElem(chars, start, Math.min(end + 1, start + length) - start, start + 9, end - start - 9));
             } else {
                 // Scan for matching closing bracket
-                int ptr = expression.indexOf(openBracket, start + 2);
+                int ptr = expression.indexOf("{", start + 2);
                 while (ptr != -1 && end != -1 && ptr < end) {
                     end = expression.indexOf(closeBracket, end + 1);
-                    ptr = expression.indexOf(openBracket, ptr + 2);
+                    ptr = expression.indexOf("{", ptr + 1);
                 }
                 if (end == -1) {
                     end = origLen;