kinman 2004/03/24 13:05:27
Modified: jasper2/src/share/org/apache/jasper/compiler Generator.java
Log:
- FIx bugzilla 16830: bodyContent content not reset when a tag is reused.
Revision Changes Path
1.227 +7 -2
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.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- Generator.java 23 Mar 2004 01:56:39 -0000 1.226
+++ Generator.java 24 Mar 2004 21:05:26 -0000 1.227
@@ -231,7 +231,8 @@
createTagHandlerPoolName(
n.getPrefix(),
n.getLocalName(),
- n.getAttributes());
+ n.getAttributes(),
+ n.hasEmptyBody());
n.setTagHandlerPoolName(name);
if (!names.contains(name)) {
names.add(name);
@@ -249,7 +250,8 @@
private String createTagHandlerPoolName(
String prefix,
String shortName,
- Attributes attrs) {
+ Attributes attrs,
+ boolean hasEmptyBody) {
String poolName = null;
if (prefix.indexOf('-') >= 0)
@@ -274,6 +276,9 @@
for (int i = 0; i < attrNames.length; i++) {
poolName = poolName + "_" + attrNames[i];
}
+ }
+ if (hasEmptyBody) {
+ poolName = poolName + "_nobody";
}
return poolName;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
