- No functional change: deferred is always true when elExpression is true.

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

diff --git a/java/org/apache/jasper/compiler/Validator.java b/java/org/apache/jasper/compiler/Validator.java
index 13819f1..fc1a902 100644 (file)
--- a/java/org/apache/jasper/compiler/Validator.java
+++ b/java/org/apache/jasper/compiler/Validator.java
@@ -1134,25 +1134,24 @@ class Validator {
                                         expectedType = JspUtil.toClass(typeStr,
                                                 loader);
                                     }
-                                    if (deferred || elExpression) {
-                                        
+                                    if (elExpression) {
+                                        // El expression
                                         validateFunctions(el, n);
                                         jspAttrs[i] = new Node.JspAttribute(tldAttrs[j],
-                                                attrs.getQName(i), attrs.getURI(i), attrs
-                                                        .getLocalName(i),
+                                                attrs.getQName(i), attrs.getURI(i), 
+                                                attrs.getLocalName(i),
                                                 attrs.getValue(i), false, el, false);
                                         ELContextImpl ctx = new ELContextImpl();
                                         ctx.setFunctionMapper(getFunctionMapper(el));
                                         try {
-                                            jspAttrs[i].validateEL(this.pageInfo
-                                                    .getExpressionFactory(), ctx);
+                                            jspAttrs[i].validateEL(this.pageInfo.getExpressionFactory(), ctx);
                                         } catch (ELException e) {
                                             this.err.jspError(n.getStart(),
-                                                    "jsp.error.invalid.expression", attrs.getValue(i), e
-                                                            .toString());
+                                                    "jsp.error.invalid.expression", 
+                                                    attrs.getValue(i), e.toString());
                                         }
-
                                     } else {
+                                        // Runtime expression
                                         jspAttrs[i] = getJspAttribute(tldAttrs[j],
                                                 attrs.getQName(i), attrs.getURI(i),
                                                 attrs.getLocalName(i), attrs