fixes mybatis#194 Incorrect parse result when a variable precedes a s…

…kipped variable.
Robinjtu · May 9, 2014 · 9476328 · 9476328
1 parent 1d33035
commit 9476328
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/main/java/org/apache/ibatis/parsing/GenericTokenParser.java b/src/main/java/org/apache/ibatis/parsing/GenericTokenParser.java
@@ -39,7 +39,7 @@ public String parse(String text) {
       while (start > -1) {
         if (start > 0 && src[start - 1] == '\\') {
           // the variable is escaped. remove the backslash.
-          builder.append(src, offset, start - 1).append(openToken);
+          builder.append(src, offset, start - offset - 1).append(openToken);
           offset = start + openToken.length();
         } else {
           int end = text.indexOf(closeToken, start);

diff --git a/src/test/java/org/apache/ibatis/parsing/GenericTokenParserTest.java b/src/test/java/org/apache/ibatis/parsing/GenericTokenParserTest.java
@@ -73,6 +73,8 @@ public void shallNotInterpolateSkippedVaiables() {
 
     assertEquals("${skipped} variable", parser.parse("\\${skipped} variable"));
     assertEquals("This is a ${skipped} variable", parser.parse("This is a \\${skipped} variable"));
+    assertEquals("null ${skipped} variable", parser.parse("${skipped} \\${skipped} variable"));
+    assertEquals("The null is ${skipped} variable", parser.parse("The ${skipped} is \\${skipped} variable"));
   }
 
   @Test(timeout = 1000)