Author: kkolinko
Date: Tue Feb 9 01:06:01 2010
New Revision: 907864
URL: http://svn.apache.org/viewvc?rev=907864&view=rev
Log:
Fix parsing bug spotted when reviewing r907538
Allowing #{} expressions to be parsed even when they are disabled breaks ${}
expressions if they are intermixed with them. See the testcase added in
r907860, r907862.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Parser.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Parser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Parser.java?rev=907864&r1=907863&r2=907864&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Parser.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Parser.java Tue Feb 9
01:06:01 2010
@@ -1415,7 +1415,9 @@
parseXMLTemplateText(parent);
} else if (!pageInfo.isELIgnored() && reader.matches("${")) {
parseELExpression(parent, '$');
- } else if (!pageInfo.isELIgnored() && reader.matches("#{")) {
+ } else if (!pageInfo.isELIgnored()
+ && !pageInfo.isDeferredSyntaxAllowedAsLiteral()
+ && reader.matches("#{")) {
parseELExpression(parent, '#');
} else if (reader.matches("<jsp:")) {
parseStandardAction(parent);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
