ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Ant.java
Date Fri, 10 Oct 2003 13:19:46 GMT
bodewig     2003/10/10 06:19:46

  Modified:    src/main/org/apache/tools/ant/taskdefs Ant.java
  Log:
  <ant> with more than one <property file="..."/> child didn't work, PR 23601
  
  Revision  Changes    Path
  1.93      +6 -4      ant/src/main/org/apache/tools/ant/taskdefs/Ant.java
  
  Index: Ant.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Ant.java,v
  retrieving revision 1.92
  retrieving revision 1.93
  diff -u -r1.92 -r1.93
  --- Ant.java	12 Sep 2003 20:56:46 -0000	1.92
  +++ Ant.java	10 Oct 2003 13:19:46 -0000	1.93
  @@ -450,10 +450,12 @@
           Set set = new HashSet();
           for (int i = properties.size() - 1; i >= 0; --i) {
               Property p = (Property) properties.get(i);
  -            if (set.contains(p.getName())) {
  -                properties.remove(i);
  -            } else {
  -                set.add(p.getName());
  +            if (p.getName() != null && !p.getName().equals("")) {
  +                if (set.contains(p.getName())) {
  +                    properties.remove(i);
  +                } else {
  +                    set.add(p.getName());
  +                }
               }
           }
           Enumeration e = properties.elements();
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message