Author: remy.maucherat(a)jboss.com Date: 2010-02-08 09:10:38 -0500 (Mon, 08 Feb 2010) New Revision: 1381 Modified: trunk/java/org/apache/jasper/compiler/Parser.java trunk/webapps/docs/changelog.xml Log: - Another EL handling fix. Modified: trunk/java/org/apache/jasper/compiler/Parser.java =================================================================== --- trunk/java/org/apache/jasper/compiler/Parser.java 2010-02-04 13:46:08 UTC (rev 1380) +++ trunk/java/org/apache/jasper/compiler/Parser.java 2010-02-08 14:10:38 UTC (rev 1381) @@ -1408,9 +1408,9 @@ parseXMLScriptlet(parent); } else if (reader.matches("<jsp:text")) { parseXMLTemplateText(parent); - } else if (reader.matches("${") && !pageInfo.isELIgnored()) { + } else if (!pageInfo.isELIgnored() && reader.matches("${")) { parseELExpression(parent, '$'); - } else if (reader.matches("#{") && !pageInfo.isELIgnored()) { + } else if (!pageInfo.isELIgnored() && reader.matches("#{")) { parseELExpression(parent, '#'); } else if (reader.matches("<jsp:")) { parseStandardAction(parent); Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2010-02-04 13:46:08 UTC (rev 1380) +++ trunk/webapps/docs/changelog.xml 2010-02-08 14:10:38 UTC (rev 1381) @@ -44,6 +44,9 @@ <fix> <bug>48616</bug>: Another variable declaration fix. (markt) </fix> + <fix> + <bug>48668</bug>: Fix handling of EL like strings when EL is disabled. (markt) + </fix> </changelog> </subsection> </section>