mbenson 2005/01/27 13:54:47
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.9 +1 -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.8
retrieving revision 1.28.2.9
diff -u -r1.28.2.8 -r1.28.2.9
--- ComponentHelper.java 26 Jan 2005 20:14:58 -0000 1.28.2.8
+++ ComponentHelper.java 27 Jan 2005 21:54:46 -0000 1.28.2.9
@@ -583,7 +583,7 @@
private boolean sameDefinition(
AntTypeDefinition def, AntTypeDefinition old) {
boolean defValid = validDefinition(def);
- boolean sameValidity = !(defValid ^ validDefinition(old));
+ boolean sameValidity = defValid ^ !validDefinition(old);
return sameValidity && (!defValid || def.sameDefinition(old,
project));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
