From 0a064d62aa4fbd154c08f320d0195a15c8cc6806 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Sat, 5 Jan 2002 03:11:56 +0000 Subject: [PATCH] Reorded addition of proeprties to environment when exec call has an additive environment so specified values overide values in the native environment. Also added basic javadocs. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270519 13f79535-47bb-0310-9956-ffa450edef68 --- .../framework/exec/launchers/DefaultCommandLauncher.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/DefaultCommandLauncher.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/DefaultCommandLauncher.java index 1b3e00d6a..86c1a42ea 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/DefaultCommandLauncher.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/DefaultCommandLauncher.java @@ -85,6 +85,12 @@ public class DefaultCommandLauncher } } + /** + * Get the native environment according to proper rules. + * Return null if no environment specified, return environment combined + * with native environment if environment data is additive else just return + * converted environment data. + */ private String[] getEnvironmentSpec( final ExecMetaData metaData ) throws ExecException, IOException { @@ -98,8 +104,8 @@ public class DefaultCommandLauncher if( metaData.isEnvironmentAdditive() ) { final Properties newEnvironment = new Properties(); - newEnvironment.putAll( environment ); newEnvironment.putAll( Environment.getNativeEnvironment() ); + newEnvironment.putAll( environment ); return ExecUtil.toNativeEnvironment( newEnvironment ); } else