luehe 2003/02/25 17:11:15
Modified: jasper2/src/share/org/apache/jasper/compiler Generator.java
Log:
Fixed 17052: jsp:element name attribute clobbered by nested jsp:attribute
(cont.)
Revision Changes Path
1.168 +9 -9
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java
Index: Generator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- Generator.java 26 Feb 2003 00:54:02 -0000 1.167
+++ Generator.java 26 Feb 2003 01:11:14 -0000 1.168
@@ -1694,12 +1694,12 @@
map.put(attrs[i].getName(), s);
}
- // Write begin tag
+ // Write begin tag, using XML-style 'name' attribute as the
+ // element name
+ String elemName = attributeValue(n.getNameAttribute(), false,
+ String.class, "null");
out.printin("out.write(\"<\"");
-
- // Write XML-style 'name' attribute
- out.print(" + " + attributeValue(n.getNameAttribute(), false,
- String.class, "null"));
+ out.print(" + " + elemName);
// Write remaining attributes
Enumeration enum = map.keys();
@@ -1729,7 +1729,7 @@
// Write end tag
out.printin("out.write(\"</\"");
- out.print((String) map.get("name"));
+ out.print(" + " + elemName);
out.println(" + \">\");");
} else {
out.println(" + \"/>\");");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
