[prev in list] [next in list] [prev in thread] [next in thread] 

List:       tomcat-dev
Subject:    svn commit: r502042 -
From:       remm () apache ! org
Date:       2007-01-31 23:31:41
Message-ID: 20070131233141.9A8D91A981F () eris ! apache ! org
[Download RAW message or body]

Author: remm
Date: Wed Jan 31 15:31:39 2007
New Revision: 502042

URL: http://svn.apache.org/viewvc?view=rev&rev=502042
Log:
- No functional change: deferred is always true when elExpression is true.

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=502042&r1=502041&r2=502042
 ==============================================================================
--- 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 Wed Jan 31 \
15:31:39 2007 @@ -1134,25 +1134,24 @@
                                         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



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


[prev in list] [next in list] [prev in thread] [next in thread]