mbenson 2005/01/28 08:02:02
Modified: src/main/org/apache/tools/ant Tag: ANT_16_BRANCH
ComponentHelper.java
Log:
Merge
Revision Changes Path
No revision
No revision
1.28.2.10 +2 -1 ant/src/main/org/apache/tools/ant/ComponentHelper.java
Index: ComponentHelper.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/ComponentHelper.java,v
retrieving revision 1.28.2.9
retrieving revision 1.28.2.10
diff -u -r1.28.2.9 -r1.28.2.10
--- ComponentHelper.java 27 Jan 2005 21:54:46 -0000 1.28.2.9
+++ ComponentHelper.java 28 Jan 2005 16:02:02 -0000 1.28.2.10
@@ -583,7 +583,8 @@
private boolean sameDefinition(
AntTypeDefinition def, AntTypeDefinition old) {
boolean defValid = validDefinition(def);
- boolean sameValidity = defValid ^ !validDefinition(old);
+ boolean sameValidity = (defValid == validDefinition(old));
+ //must have same validity; then if they are valid they must also be
the same:
return sameValidity && (!defValid || def.sameDefinition(old,
project));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
