diff --git a/WHATSNEW b/WHATSNEW index ad8acd175..50d6748f1 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -27,6 +27,8 @@ Other changes: * strict attribute added to . Bugzilla Report 54889. + * simplifying Execute.getEnvironmentVariables since we are only running on Java 1.5 or higher now + Changes from Ant 1.8.4 TO Ant 1.9.0 =================================== diff --git a/src/main/org/apache/tools/ant/taskdefs/Execute.java b/src/main/org/apache/tools/ant/taskdefs/Execute.java index d6f065a01..15fca4081 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Execute.java +++ b/src/main/org/apache/tools/ant/taskdefs/Execute.java @@ -38,7 +38,6 @@ import org.apache.tools.ant.taskdefs.condition.Os; import org.apache.tools.ant.taskdefs.launcher.CommandLauncher; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.util.FileUtils; -import org.apache.tools.ant.util.JavaEnvUtils; import org.apache.tools.ant.util.StringUtils; /** @@ -109,14 +108,9 @@ public class Execute { if (procEnvironment != null) { return procEnvironment; } - if (JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_1_5) - && !Os.isFamily("openvms")) { + if (!Os.isFamily("openvms")) { try { - @SuppressWarnings("unchecked") - final Map cast = (Map) System.class - .getMethod("getenv", new Class[0]) - .invoke(null, new Object[0]); - procEnvironment = cast; + procEnvironment = System.getenv(); return procEnvironment; } catch (Exception x) { x.printStackTrace();