peterreilly 2005/03/15 05:35:28
Modified: . WHATSNEW
src/main/org/apache/tools/ant/taskdefs MacroDef.java
Log:
<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.
PR: 31215
Revision Changes Path
1.780 +5 -0 ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.779
retrieving revision 1.780
diff -u -r1.779 -r1.780
--- WHATSNEW 14 Mar 2005 20:09:54 -0000 1.779
+++ WHATSNEW 15 Mar 2005 13:35:28 -0000 1.780
@@ -275,6 +275,11 @@
* The .NET compilation tasks failed if filenames given as references
contained spaces. Bugzilla Report 27170.
+* <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:
-----------
1.31 +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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- MacroDef.java 14 Jan 2005 16:49:34 -0000 1.30
+++ MacroDef.java 15 Mar 2005 13:35:28 -0000 1.31
@@ -716,6 +716,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]
