You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2007/04/18 02:32:37 UTC
svn commit: r529818 - in /tomcat/tc6.0.x/trunk:
java/org/apache/jasper/compiler/Validator.java webapps/docs/changelog.xml
Author: markt
Date: Tue Apr 17 17:32:36 2007
New Revision: 529818
URL: http://svn.apache.org/viewvc?view=rev&rev=529818
Log:
Fix bug 41869. TagData.getAttribute() should return TagData.REQUEST_TIME_VALUE when the attribute value is an EL expression.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
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=529818&r1=529817&r2=529818
==============================================================================
--- 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 Tue Apr 17 17:32:36 2007
@@ -1320,7 +1320,7 @@
validateFunctions(el, n);
result = new Node.JspAttribute(tai, qName, uri,
- localName, value, false, el, dynamic);
+ localName, value, true, el, dynamic);
ELContextImpl ctx = new ELContextImpl();
ctx.setFunctionMapper(getFunctionMapper(el));
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?view=diff&rev=529818&r1=529817&r2=529818
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Apr 17 17:32:36 2007
@@ -43,6 +43,15 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
+ <bug>41869</bug> TagData.getAttribute() should return
+ TagData.REQUEST_TIME_VALUE when the attribute value is an EL expression.
+ (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 6.0.11 (remm)">
<subsection name="General">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r529818 - in /tomcat/tc6.0.x/trunk: java/org/apache/jasper/compiler/Validator.java
webapps/docs/changelog.xml
Posted by Mark Thomas <ma...@apache.org>.
Remy Maucherat wrote:
> Remy Maucherat wrote:
>> If REQUEST_TIME_VALUE should be set for EL too
>
> The javadoc for getAttribute in TagData indicates it should be set for
> EL too.
Yep. I was looking at JSP.13.9.9.3
> I recommend this patch instead for TC 6.0:
Thanks. I'll take another look at this (and for 5.5 as well).
> (another one line patch which may break everything, cool)
If only we didn't have to be spec compliant ;)
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r529818 - in /tomcat/tc6.0.x/trunk: java/org/apache/jasper/compiler/Validator.java
webapps/docs/changelog.xml
Posted by Remy Maucherat <re...@apache.org>.
Remy Maucherat wrote:
> If REQUEST_TIME_VALUE should be set for EL too
The javadoc for getAttribute in TagData indicates it should be set for
EL too.
I recommend this patch instead for TC 6.0:
Index: Validator.java
===================================================================
--- Validator.java (revision 528865)
+++ Validator.java (working copy)
@@ -1177,7 +1177,7 @@
.getLocalName(i),
attrs.getValue(i), false, null,
false);
}
- if (jspAttrs[i].isExpression()) {
+ if (expression) {
tagDataAttrs.put(attrs.getQName(i),
TagData.REQUEST_TIME_VALUE);
} else {
(another one line patch which may break everything, cool)
Rémy
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r529818 - in /tomcat/tc6.0.x/trunk: java/org/apache/jasper/compiler/Validator.java
webapps/docs/changelog.xml
Posted by Remy Maucherat <re...@apache.org>.
markt@apache.org wrote:
> Author: markt
> Date: Tue Apr 17 17:32:36 2007
> New Revision: 529818
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=529818
> Log:
> Fix bug 41869. TagData.getAttribute() should return TagData.REQUEST_TIME_VALUE when the attribute value is an EL expression.
-1. This flag is meant to represent if this is a the <% scriplet
thingie, not EL.
If REQUEST_TIME_VALUE should be set for EL too (which I am not
convinced, but I don't know the spec very well overall), then it can be
done at the end of the method:
if (jspAttrs[i].isExpression()) {
tagDataAttrs.put(attrs.getQName(i),
TagData.REQUEST_TIME_VALUE);
} else {
tagDataAttrs.put(attrs.getQName(i), attrs
.getValue(i));
}
Rémy
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org