[jbossweb-commits] JBossWeb SVN: r787 - in trunk: java/org/apache/el/lang and 1 other directories.

Author: remy.maucherat(a)jboss.com Date: 2008-09-18 22:14:12 -0400 (Thu, 18 Sep 2008) New Revision: 787 Modified: trunk/BUILDING.txt trunk/java/org/apache/el/lang/ExpressionBuilder.java trunk/webapps/docs/changelog.xml Log: - Fix possible class cast. Modified: trunk/BUILDING.txt =================================================================== --- trunk/BUILDING.txt 2008-09-19 02:13:40 UTC (rev 786) +++ trunk/BUILDING.txt 2008-09-19 02:14:12 UTC (rev 787) @@ -122,6 +122,6 @@ Download JavaCC 4.1+ export JAVACC_HOME=/somepath/javacc-4.1 export PATH=$JAVACC_HOME/bin:$PATH - cd java/org/apache/el/parser + cd ${jboss-web.source}/java/org/apache/el/parser jjtree ELParser.jjt javacc ELParser.jj Modified: trunk/java/org/apache/el/lang/ExpressionBuilder.java =================================================================== --- trunk/java/org/apache/el/lang/ExpressionBuilder.java 2008-09-19 02:13:40 UTC (rev 786) +++ trunk/java/org/apache/el/lang/ExpressionBuilder.java 2008-09-19 02:14:12 UTC (rev 787) @@ -132,7 +132,11 @@ try { node.accept(this); } catch (Exception e) { - throw (ELException) e; + if (e instanceof ELException) { + throw (ELException) e; + } else { + throw (new ELException(e)); + } } if (this.fnMapper instanceof FunctionMapperFactory) { this.fnMapper = ((FunctionMapperFactory) this.fnMapper).create(); Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2008-09-19 02:13:40 UTC (rev 786) +++ trunk/webapps/docs/changelog.xml 2008-09-19 02:14:12 UTC (rev 787) @@ -48,6 +48,12 @@ <fix> <bug>45427</bug>: Correct parsing of quoted stings in EL. (markt) </fix> + <fix> + Optimize EL parser lookahead. (markt) + </fix> + <fix> + Fix bad EL exception cast. (rjung) + </fix> </changelog> </subsection> </section>