Author: kkolinko
Date: Tue Apr 29 00:01:43 2014
New Revision: 1590844
URL: http://svn.apache.org/r1590844
Log:
Merged r1590801 from tomcat/trunk:
Document JspAttribute.isDynamic() and correct wrong value of this flag for
"omit" attribute of <jsp:attribute> action.
I think there were no observable consequences of this typo. The "dynamic" flag
makes sense only for attributes of a CustomTag.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Node.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1590801
Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Node.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Node.java?rev=1590844&r1=1590843&r2=1590844&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Node.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Node.java Tue Apr 29
00:01:43 2014
@@ -2308,7 +2308,9 @@ abstract class Node implements TagConsta
}
/**
- * XXX
+ * <code>true</code> if the attribute is a "dynamic" attribute of a
+ * custom tag that implements DynamicAttributes interface. That is,
+ * a random extra attribute that is not declared by the tag.
*/
public boolean isDynamic() {
return dynamic;
Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Validator.java?rev=1590844&r1=1590843&r2=1590844&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Validator.java Tue Apr
29 00:01:43 2014
@@ -692,7 +692,7 @@ class Validator {
public void visit(Node.NamedAttribute n) throws JasperException {
JspUtil.checkAttributes("Attribute", n, attributeAttrs, err);
n.setOmit(getJspAttribute(null, "omit", null, null, n
- .getAttributeValue("omit"), n, true));
+ .getAttributeValue("omit"), n, false));
visitBody(n);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
