Author: remy.maucherat(a)jboss.com Date: 2010-04-12 07:05:36 -0400 (Mon, 12 Apr 2010) New Revision: 1434 Modified: trunk/java/org/apache/el/parser/ELParser.jjt trunk/java/org/apache/el/parser/ELParserTokenManager.java trunk/webapps/docs/changelog.xml Log: - Port minor EL parsing fix. Modified: trunk/java/org/apache/el/parser/ELParser.jjt =================================================================== --- trunk/java/org/apache/el/parser/ELParser.jjt 2010-04-08 22:33:40 UTC (rev 1433) +++ trunk/java/org/apache/el/parser/ELParser.jjt 2010-04-12 11:05:36 UTC (rev 1434) @@ -374,7 +374,7 @@ */ < LITERAL_EXPRESSION: ( (~["$", "#", "\\"])* "\\" (["$", "#"])? - | (~["$", "#"])* (["$", "#"] ~["{"]) + | (~["$", "#"])* (["$", "#"] ~["{", "$", "#"]) | (~["$", "#"])+ )+ | "$" Modified: trunk/java/org/apache/el/parser/ELParserTokenManager.java =================================================================== --- trunk/java/org/apache/el/parser/ELParserTokenManager.java 2010-04-08 22:33:40 UTC (rev 1433) +++ trunk/java/org/apache/el/parser/ELParserTokenManager.java 2010-04-12 11:05:36 UTC (rev 1434) @@ -128,6 +128,8 @@ jjCheckNAdd(5); break; case 5: + if ((0xffffffe7ffffffffL & l) == 0L) + break; if (kind > 1) kind = 1; jjCheckNAddStates(5, 8); Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2010-04-08 22:33:40 UTC (rev 1433) +++ trunk/webapps/docs/changelog.xml 2010-04-12 11:05:36 UTC (rev 1434) @@ -24,6 +24,13 @@ </update> </changelog> </subsection> + <subsection name="Jasper"> + <changelog> + <fix> + <bug>49081</bug>: EL parsing fix. (markt) + </fix> + </changelog> + </subsection> </section> <section name="JBoss Web 3.0.0.Beta4 (remm)">