Fix the remaining test failures

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@896594 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/el/parser/AstLiteralExpression.java b/java/org/apache/el/parser/AstLiteralExpression.java
index b5a7fdd..b018251 100644 (file)
--- a/java/org/apache/el/parser/AstLiteralExpression.java
+++ b/java/org/apache/el/parser/AstLiteralExpression.java
@@ -52,9 +52,10 @@ public final class AstLiteralExpression extends SimpleNode {
         StringBuilder buf = new StringBuilder(size);
         for (int i = 0; i < size; i++) {
             char c = image.charAt(i);
-            if (c == '\\' && i + 1 < size) {
+            if (c == '\\' && i + 2 < size) {
                 char c1 = image.charAt(i + 1);
-                if (c1 == '#' || c1 == '$') {
+                char c2 = image.charAt(i + 2);
+                if ((c1 == '#' || c1 == '$') && c2 == '{')  {
                     c = c1;
                     i++;
                 }