- Fix non deferred attributes evaluation.

- Headache inducing patch submitted by Stan Silvert.

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

diff --git a/java/org/apache/jasper/compiler/Generator.java b/java/org/apache/jasper/compiler/Generator.java
index 537bd72..0feeda1 100644 (file)
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -2817,6 +2817,24 @@ class Generator {
                     sb.append(',');
                     sb.append(returnType);
                     sb.append("))");
+                    // should the expression be evaluated before passing to
+                    // the setter?
+                    boolean evaluate = false;
+                    if (tai.canBeRequestTime()) {
+                        evaluate = true; // JSP.2.3.2
+                    }
+                    if (attr.isDeferredInput()) {
+                        evaluate = false; // JSP.2.3.3
+                    }
+                    if (attr.isDeferredInput() && tai.canBeRequestTime()) {
+                        evaluate = !attrValue.contains("#{"); // JSP.2.3.5
+                    }
+                    if (evaluate) {
+                        sb.append(".getValue(");
+                        sb.append(getJspContextVar());
+                        sb.append(".getELContext()");
+                        sb.append(")");
+                    } 
                     attrValue = sb.toString();
                 } else if (attr.isDeferredMethodInput()
                         || MethodExpression.class.getName().equals(type)) {