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 @@
* <csc>'s extraoptions can now contain multiple arguments.
Bugzilla Report 23599.
+* <macrodef> 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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
