luehe 2003/01/14 14:32:59
Modified: jasper2/src/share/org/apache/jasper/compiler Node.java
Validator.java
Log:
Fixed 16077: Invalid error generated when translating a valid JSP document
Revision Changes Path
1.54 +6 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Node.java
Index: Node.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Node.java,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- Node.java 11 Jan 2003 00:52:14 -0000 1.53
+++ Node.java 14 Jan 2003 22:32:58 -0000 1.54
@@ -195,6 +195,9 @@
/**
* Searches all subnodes of this node for jsp:attribute standard
* actions, and returns that set of nodes as a Node.Nodes object.
+ *
+ * @return Possibly empty Node.Nodes object containing any jsp:attribute
+ * subnodes of this Node
*/
public Node.Nodes getNamedAttributeNodes() {
1.66 +4 -4
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java
Index: Validator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- Validator.java 8 Jan 2003 18:42:43 -0000 1.65
+++ Validator.java 14 Jan 2003 22:32:58 -0000 1.66
@@ -657,7 +657,7 @@
}
public void visit(Node.UninterpretedTag n) throws JasperException {
- if (n.getNamedAttributeNodes() != null) {
+ if (n.getNamedAttributeNodes().size() != 0) {
err.jspError(n, "jsp.error.namedAttribute.invalidUse");
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
