kinman 2004/03/24 13:31:07
Modified: jasper2/src/share/org/apache/jasper/compiler Tag:
tomcat_4_branch Generator.java
Log:
-Fix 16830: bodyContent content not reset when a tag is reused.
Revision Changes Path
No revision
No revision
1.35.2.22 +10 -5
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.35.2.21
retrieving revision 1.35.2.22
diff -u -r1.35.2.21 -r1.35.2.22
--- Generator.java 5 Feb 2004 22:19:07 -0000 1.35.2.21
+++ Generator.java 24 Mar 2004 21:31:07 -0000 1.35.2.22
@@ -195,7 +195,8 @@
String name = createTagHandlerPoolName(n.getPrefix(),
n.getShortName(),
- n.getAttributes());
+ n.getAttributes(),
+ n.getBody() == null);
n.setTagHandlerPoolName(name);
if (!names.contains(name)) {
names.add(name);
@@ -212,7 +213,8 @@
*/
private String createTagHandlerPoolName(String prefix,
String shortName,
- Attributes attrs) {
+ Attributes attrs,
+ boolean hasEmptyBody) {
String poolName = null;
if (prefix.indexOf('-') >= 0)
@@ -238,6 +240,9 @@
poolName = poolName + "_" + attrNames[i];
}
}
+ if (hasEmptyBody) {
+ poolName = poolName + "_nobody";
+ }
return poolName;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
