bodewig 2003/10/10 06:21:22
Modified: src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
Ant.java
Log:
Merge from HEAD
Revision Changes Path
No revision
No revision
1.92.2.1 +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.92.2.1
diff -u -r1.92 -r1.92.2.1
--- Ant.java 12 Sep 2003 20:56:46 -0000 1.92
+++ Ant.java 10 Oct 2003 13:21:22 -0000 1.92.2.1
@@ -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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
