Return-Path: Delivered-To: apmail-ant-dev-archive@www.apache.org Received: (qmail 35286 invoked from network); 15 Mar 2005 13:36:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 15 Mar 2005 13:36:26 -0000 Received: (qmail 17994 invoked by uid 500); 15 Mar 2005 13:36:25 -0000 Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 17945 invoked by uid 500); 15 Mar 2005 13:36:24 -0000 Mailing-List: contact dev-help@ant.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list dev@ant.apache.org Received: (qmail 17926 invoked by uid 500); 15 Mar 2005 13:36:24 -0000 Received: (qmail 17919 invoked by uid 99); 15 Mar 2005 13:36:24 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Tue, 15 Mar 2005 05:36:24 -0800 Received: (qmail 35261 invoked by uid 1539); 15 Mar 2005 13:36:23 -0000 Date: 15 Mar 2005 13:36:23 -0000 Message-ID: <20050315133623.35260.qmail@minotaur.apache.org> From: peterreilly@apache.org To: ant-cvs@apache.org Subject: cvs commit: ant/src/main/org/apache/tools/ant/taskdefs MacroDef.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N peterreilly 2005/03/15 05:36:23 Modified: . Tag: ANT_16_BRANCH WHATSNEW src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH MacroDef.java Log: sync- bugzilla 31215 Revision Changes Path No revision No revision 1.503.2.198 +5 -0 ant/WHATSNEW Index: WHATSNEW =================================================================== RCS file: /home/cvs/ant/WHATSNEW,v retrieving revision 1.503.2.197 retrieving revision 1.503.2.198 diff -u -r1.503.2.197 -r1.503.2.198 --- WHATSNEW 14 Mar 2005 19:20:14 -0000 1.503.2.197 +++ WHATSNEW 15 Mar 2005 13:36:22 -0000 1.503.2.198 @@ -289,6 +289,11 @@ * 's extraoptions can now contain multiple arguments. Bugzilla Report 23599. +* with default values set by properties would be + seen as new definitions when called twice with different properties. + This was confusing so the definitions are now treated as similar. + Bugzilla Report 31215. + Fixed bugs: ----------- No revision No revision 1.7.2.20 +6 -0 ant/src/main/org/apache/tools/ant/taskdefs/MacroDef.java Index: MacroDef.java =================================================================== RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/MacroDef.java,v retrieving revision 1.7.2.19 retrieving revision 1.7.2.20 diff -u -r1.7.2.19 -r1.7.2.20 --- MacroDef.java 4 Jun 2004 07:39:09 -0000 1.7.2.19 +++ MacroDef.java 15 Mar 2005 13:36:23 -0000 1.7.2.20 @@ -646,6 +646,12 @@ if (!name.equals(other.name)) { return false; } + // Allow two macro definitions with the same location + // to be treated as similar - bugzilla 31215 + if (other.getLocation() != null + && other.getLocation().equals(getLocation())) { + return true; + } if (text == null) { if (other.text != null) { return false; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org For additional commands, e-mail: dev-help@ant.apache.org