peterreilly 2003/10/15 00:40:33
Modified: src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
MacroDef.java
Log:
Merge with HEAD
Revision Changes Path
No revision
No revision
1.7.2.3 +12 -9 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.2
retrieving revision 1.7.2.3
diff -u -r1.7.2.2 -r1.7.2.3
--- MacroDef.java 23 Sep 2003 14:04:36 -0000 1.7.2.2
+++ MacroDef.java 15 Oct 2003 07:40:32 -0000 1.7.2.3
@@ -269,15 +269,17 @@
}
Attribute other = (Attribute) obj;
if (name == null) {
- return other.name == null;
- }
- if (!name.equals(other.name)) {
+ if (other.name != null) {
+ return false;
+ }
+ } else if (!name.equals(other.name)) {
return false;
}
if (defaultValue == null) {
- return other.defaultValue == null;
- }
- if (!name.equals(other.defaultValue)) {
+ if (other.defaultValue != null) {
+ return false;
+ }
+ } else if (!defaultValue.equals(other.defaultValue)) {
return false;
}
return true;
@@ -343,9 +345,10 @@
}
TemplateElement other = (TemplateElement) obj;
if (name == null) {
- return other.name == null;
- }
- if (!name.equals(other.name)) {
+ if (other.name != null) {
+ return false;
+ }
+ } else if (!name.equals(other.name)) {
return false;
}
return optional == other.optional;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
