ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers DefaultCommandLauncher.java
Date Sat, 05 Jan 2002 03:11:56 GMT
donaldp     02/01/04 19:11:56

  Modified:    proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers
                        DefaultCommandLauncher.java
  Log:
  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.
  
  Revision  Changes    Path
  1.6       +8 -2      jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/DefaultCommandLauncher.java
  
  Index: DefaultCommandLauncher.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/DefaultCommandLauncher.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DefaultCommandLauncher.java	5 Jan 2002 03:09:24 -0000	1.5
  +++ DefaultCommandLauncher.java	5 Jan 2002 03:11:56 -0000	1.6
  @@ -26,7 +26,7 @@
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
    * @author <a href="mailto:thomas.haas@softwired-inc.com">Thomas Haas</a>
  - * @version $Revision: 1.5 $ $Date: 2002/01/05 03:09:24 $
  + * @version $Revision: 1.6 $ $Date: 2002/01/05 03:11:56 $
    */
   public class DefaultCommandLauncher
       implements CommandLauncher
  @@ -85,6 +85,12 @@
           }
       }
   
  +    /**
  +     * 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 @@
               if( metaData.isEnvironmentAdditive() )
               {
                   final Properties newEnvironment = new Properties();
  -                newEnvironment.putAll( environment );
                   newEnvironment.putAll( Environment.getNativeEnvironment() );
  +                newEnvironment.putAll( environment );
                   return ExecUtil.toNativeEnvironment( newEnvironment );
               }
               else
  
  
  

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


Mime
View raw message