mbenson     2005/08/09 07:55:07

  Modified:    src/main/org/apache/tools/ant/types Resource.java
  Log:
  Fix reversed ?: consequences; avoid NPE.
  PR: 36094
  Obtained from: Dave Brosius
  
  Revision  Changes    Path
  1.16      +1 -1      ant/src/main/org/apache/tools/ant/types/Resource.java
  
  Index: Resource.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/Resource.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- Resource.java     5 Aug 2005 15:45:18 -0000       1.15
  +++ Resource.java     9 Aug 2005 14:55:07 -0000       1.16
  @@ -294,7 +294,7 @@
               return getCheckedRef().hashCode();
           }
           String name = getName();
  -        return MAGIC * (name == null ? name.hashCode() : NULL_NAME);
  +        return MAGIC * (name == null ? NULL_NAME : name.hashCode());
       }
   
       /**
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to