Return-Path: Delivered-To: apmail-ant-dev-archive@www.apache.org Received: (qmail 85189 invoked from network); 23 Aug 2006 22:33:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 23 Aug 2006 22:33:00 -0000 Received: (qmail 38226 invoked by uid 500); 23 Aug 2006 22:33:00 -0000 Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 37895 invoked by uid 500); 23 Aug 2006 22:32:59 -0000 Mailing-List: contact dev-help@ant.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list dev@ant.apache.org Received: (qmail 37884 invoked by uid 500); 23 Aug 2006 22:32:59 -0000 Received: (qmail 37881 invoked by uid 99); 23 Aug 2006 22:32:59 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Aug 2006 15:32:59 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Aug 2006 15:32:58 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 1BD251A981D; Wed, 23 Aug 2006 15:32:38 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r434226 - in /ant/core/trunk: CONTRIBUTORS WHATSNEW src/main/org/apache/tools/ant/taskdefs/MacroInstance.java Date: Wed, 23 Aug 2006 22:32:37 -0000 To: ant-cvs@apache.org From: peterreilly@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060823223238.1BD251A981D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: peterreilly Date: Wed Aug 23 15:32:36 2006 New Revision: 434226 URL: http://svn.apache.org/viewvc?rev=434226&view=rev Log: [PATCH] bugzilla 40238 - nested macrodef Modified: ant/core/trunk/CONTRIBUTORS ant/core/trunk/WHATSNEW ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java Modified: ant/core/trunk/CONTRIBUTORS URL: http://svn.apache.org/viewvc/ant/core/trunk/CONTRIBUTORS?rev=434226&r1=434225&r2=434226&view=diff ============================================================================== Binary files - no diff available. Modified: ant/core/trunk/WHATSNEW URL: http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=434226&r1=434225&r2=434226&view=diff ============================================================================== --- ant/core/trunk/WHATSNEW (original) +++ ant/core/trunk/WHATSNEW Wed Aug 23 15:32:36 2006 @@ -270,6 +270,9 @@ * has a new adapter, xnew, to use the -XNew back end on java1.5+. By forking rmic, this works on java1.6+. Bugzilla report 38732. +* Copy of UnknownElement in macroinstance was not recursive. + Bugzilla report 40238. + Other changes: -------------- Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java?rev=434226&r1=434225&r2=434226&view=diff ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java Wed Aug 23 15:32:36 2006 @@ -291,7 +291,7 @@ } for (Iterator i = unknownElements.iterator(); i.hasNext();) { - UnknownElement child = (UnknownElement) i.next(); + UnknownElement child = copy((UnknownElement) i.next()); rc.addChild(child.getWrapper()); ret.addChild(child); } @@ -307,7 +307,7 @@ } for (Iterator i = list.iterator(); i.hasNext();) { - UnknownElement child = (UnknownElement) i.next(); + UnknownElement child = copy((UnknownElement) i.next()); rc.addChild(child.getWrapper()); ret.addChild(child); } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org For additional commands, e-mail: dev-help@ant.apache.org