You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2007/01/22 21:49:03 UTC

svn commit: r498793 - /tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java

Author: remm
Date: Mon Jan 22 12:49:02 2007
New Revision: 498793

URL: http://svn.apache.org/viewvc?view=rev&rev=498793
Log:
- isELEnabled may return true for a variety of reasons, so the actual value should be checked.

Modified:
    tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java?view=diff&rev=498793&r1=498792&r2=498793
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java Mon Jan 22 12:49:02 2007
@@ -1051,7 +1051,8 @@
                     }
                 }
 
-                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())



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