From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 8 Feb 2010 02:00:58 +0000 (+0000)
Subject: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48668
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=fd4fc3f71b0f764ba65e69709119d3321e54a1b7;p=tomcat7.0

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

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@907538 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/jasper/compiler/Parser.java b/java/org/apache/jasper/compiler/Parser.java
index c6349e740..dcef0fb6b 100644
--- a/java/org/apache/jasper/compiler/Parser.java
+++ b/java/org/apache/jasper/compiler/Parser.java
@@ -1413,9 +1413,9 @@ class Parser implements TagConstants {
             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);