diff --git a/src/java/net/brutex/xservices/types/ant/AntProperty.java b/src/java/net/brutex/xservices/types/ant/AntProperty.java index f60c9b6..b93d6c2 100644 --- a/src/java/net/brutex/xservices/types/ant/AntProperty.java +++ b/src/java/net/brutex/xservices/types/ant/AntProperty.java @@ -18,6 +18,7 @@ package net.brutex.xservices.types.ant; import java.util.ArrayList; import java.util.List; import java.util.Map; + import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @@ -44,13 +45,13 @@ public class AntProperty { /** * Converts a Map<String, String> into a list of * AntProperties. - * @param map The map to convert + * @param newMap The map to convert * @return A list of key/value pairs */ - public static List createAntPropertyList(Map map) { + public static List createAntPropertyList(Map newMap) { List list = new ArrayList(); - for(Map.Entry e : map.entrySet()) { - list.add(new AntProperty(e.getKey(), e.getValue())); + for(Map.Entry e : newMap.entrySet()) { + list.add(new AntProperty(e.getKey(), (String)e.getValue())); } return list; } diff --git a/src/java/net/brutex/xservices/util/RunTask.java b/src/java/net/brutex/xservices/util/RunTask.java index 9cc85ab..f901f71 100644 --- a/src/java/net/brutex/xservices/util/RunTask.java +++ b/src/java/net/brutex/xservices/util/RunTask.java @@ -19,6 +19,7 @@ import java.io.ByteArrayOutputStream; import java.io.PrintStream; import java.util.HashMap; import java.util.Map; + import net.brutex.xservices.types.ReturnCode; import net.brutex.xservices.types.ant.AntProperty; @@ -80,14 +81,14 @@ public class RunTask { */ public ReturnCode postTask() throws BuildException { int returnCode = 0; - Map origMap = new HashMap(); - Map newMap = null; + Map origMap = new HashMap(); + Map newMap = null; origMap.putAll(antproject.getProperties()); antproject.executeTarget(anttarget.getName()); newMap = antproject.getProperties(); newMap.putAll(antproject.getUserProperties()); - for (Map.Entry e : origMap.entrySet()) { + for (Map.Entry e : origMap.entrySet()) { newMap.remove(e.getKey()); }