Author: markt
Date: Wed Jan 6 18:18:09 2010
New Revision: 896594
URL: http://svn.apache.org/viewvc?rev=896594&view=rev
Log:
Fix the remaining test failures
Modified:
tomcat/trunk/java/org/apache/el/parser/AstLiteralExpression.java
Modified: tomcat/trunk/java/org/apache/el/parser/AstLiteralExpression.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstLiteralExpression.java?rev=896594&r1=896593&r2=896594&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstLiteralExpression.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstLiteralExpression.java Wed Jan 6
18:18:09 2010
@@ -52,9 +52,10 @@
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++;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
