ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mben...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant ComponentHelper.java
Date Fri, 28 Jan 2005 16:01:07 GMT
mbenson     2005/01/28 08:01:07

  Modified:    src/main/org/apache/tools/ant ComponentHelper.java
  Log:
  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!
  
  Revision  Changes    Path
  1.48      +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.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- ComponentHelper.java	27 Jan 2005 21:53:27 -0000	1.47
  +++ ComponentHelper.java	28 Jan 2005 16:01:07 -0000	1.48
  @@ -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: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message