From 58e0d44ddfcdcbd18d16c9a7be8c10867870bdd8 Mon Sep 17 00:00:00 2001 From: Matthew Jason Benson Date: Fri, 28 Jan 2005 16:01:07 +0000 Subject: [PATCH] Who'd have guessed that: boolean xor not boolean is equivalent to: boolean == boolean? Added a comment as well so Peter will be my friend again! git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@277544 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/tools/ant/ComponentHelper.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/org/apache/tools/ant/ComponentHelper.java b/src/main/org/apache/tools/ant/ComponentHelper.java index f7790459c..7786c2574 100644 --- a/src/main/org/apache/tools/ant/ComponentHelper.java +++ b/src/main/org/apache/tools/ant/ComponentHelper.java @@ -583,7 +583,8 @@ public class ComponentHelper { 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)); }