Revert previous fix for 41869 and apply Remy's suggested fix.

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

diff --git a/java/org/apache/jasper/compiler/Validator.java b/java/org/apache/jasper/compiler/Validator.java
index 8268952..da81d47 100644 (file)
--- a/java/org/apache/jasper/compiler/Validator.java
+++ b/java/org/apache/jasper/compiler/Validator.java
@@ -1177,7 +1177,7 @@ class Validator {
                                             .getLocalName(i),
                                     attrs.getValue(i), false, null, false);
                         }
-                        if (jspAttrs[i].isExpression()) {
+                        if (expression) {
                             tagDataAttrs.put(attrs.getQName(i),
                                     TagData.REQUEST_TIME_VALUE);
                         } else {
@@ -1320,7 +1320,7 @@ class Validator {
                         validateFunctions(el, n);
 
                         result = new Node.JspAttribute(tai, qName, uri,
-                                localName, value, true, el, dynamic);
+                                localName, value, false, el, dynamic);
 
                         ELContextImpl ctx = new ELContextImpl();
                         ctx.setFunctionMapper(getFunctionMapper(el));