From: remm <remm@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 22 Jan 2007 20:49:02 +0000 (+0000)
Subject: - isELEnabled may return true for a variety of reasons, so the actual value should... 
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=aab274b9d53085523eb7d44cb7a50fe270b8dff4;p=tomcat7.0

- isELEnabled may return true for a variety of reasons, so the actual value should be checked.

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

diff --git a/java/org/apache/jasper/compiler/Validator.java b/java/org/apache/jasper/compiler/Validator.java
index c0b88b82f..5ce835e84 100644
--- a/java/org/apache/jasper/compiler/Validator.java
+++ b/java/org/apache/jasper/compiler/Validator.java
@@ -1051,7 +1051,8 @@ class Validator {
                     }
                 }
 
-                boolean expression = runtimeExpression || (elExpression  && !pageInfo.isELIgnored());
+                boolean expression = runtimeExpression 
+                    || (elExpression  && (!pageInfo.isELIgnored() || (!"true".equalsIgnoreCase(pageInfo.getIsELIgnored()) && checkDeferred && deferred)));
                 
                 for (int j = 0; tldAttrs != null && j < tldAttrs.length; j++) {
                     if (attrs.getLocalName(i).equals(tldAttrs[j].getName())