svn commit: r907538 - /tomcat/trunk/java/org/apache/jasper/compiler/Parser.java

[markt]

Author: markt
Date: Mon Feb  8 02:00:58 2010
New Revision: 907538

URL: http://svn.apache.org/viewvc?rev=907538&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48668
Don't look for EL matches (which swallow the EL match string) if EL is not 
enabled

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=907538&r1=907537&r2=907538&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Parser.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Parser.java Mon Feb  8 
02:00:58 2010
@@ -1413,9 +1413,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);



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org