Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@www.apache.org Received: (qmail 35712 invoked from network); 24 Mar 2004 21:05:34 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 24 Mar 2004 21:05:34 -0000 Received: (qmail 57924 invoked by uid 500); 24 Mar 2004 21:05:21 -0000 Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org Received: (qmail 57763 invoked by uid 500); 24 Mar 2004 21:05:20 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 57750 invoked by uid 500); 24 Mar 2004 21:05:19 -0000 Received: (qmail 57745 invoked from network); 24 Mar 2004 21:05:19 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 24 Mar 2004 21:05:19 -0000 Received: (qmail 35646 invoked by uid 1384); 24 Mar 2004 21:05:27 -0000 Date: 24 Mar 2004 21:05:27 -0000 Message-ID: <20040324210527.35644.qmail@minotaur.apache.org> From: kinman@apache.org To: jakarta-tomcat-jasper-cvs@apache.org Subject: cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler Generator.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N 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: tomcat-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org