Author: jfrederic.clere(a)jboss.com
Date: 2011-08-12 02:30:06 -0400 (Fri, 12 Aug 2011)
New Revision: 1808
Modified:
branches/2.1.x/java/org/apache/el/parser/ELParser.jjt
branches/2.1.x/java/org/apache/el/parser/ELParserTokenManager.java
branches/2.1.x/webapps/docs/changelog.xml
Log:
Port r1434.
Modified: branches/2.1.x/java/org/apache/el/parser/ELParser.jjt
===================================================================
--- branches/2.1.x/java/org/apache/el/parser/ELParser.jjt 2011-08-11 19:30:51 UTC (rev
1807)
+++ branches/2.1.x/java/org/apache/el/parser/ELParser.jjt 2011-08-12 06:30:06 UTC (rev
1808)
@@ -360,7 +360,7 @@
*/
< LITERAL_EXPRESSION:
( (~["$", "#", "\\"])* "\\"
(["$", "#"])?
- | (~["$", "#"])* (["$", "#"]
~["{"])
+ | (~["$", "#"])* (["$", "#"]
~["{", "$", "#"])
| (~["$", "#"])+
)+
| "$"
Modified: branches/2.1.x/java/org/apache/el/parser/ELParserTokenManager.java
===================================================================
--- branches/2.1.x/java/org/apache/el/parser/ELParserTokenManager.java 2011-08-11 19:30:51
UTC (rev 1807)
+++ branches/2.1.x/java/org/apache/el/parser/ELParserTokenManager.java 2011-08-12 06:30:06
UTC (rev 1808)
@@ -128,6 +128,8 @@
jjCheckNAdd(5);
break;
case 5:
+ if ((0xffffffe7ffffffffL & l) == 0L)
+ break;
if (kind > 1)
kind = 1;
jjCheckNAddStates(5, 8);
Modified: branches/2.1.x/webapps/docs/changelog.xml
===================================================================
--- branches/2.1.x/webapps/docs/changelog.xml 2011-08-11 19:30:51 UTC (rev 1807)
+++ branches/2.1.x/webapps/docs/changelog.xml 2011-08-12 06:30:06 UTC (rev 1808)
@@ -75,6 +75,13 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
+ <bug>49081</bug>: EL parsing fix. (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="JBoss Web 2.1.10.GA (remm)">
Show replies by date