fixed JENKINS-8614 ProcessTreeTest fails on Windows

jenkinsci · Apr 6, 2013 · cdc18ec · cdc18ec
1 parent 4709490
commit cdc18ec
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/core/src/main/java/hudson/util/ProcessTree.java b/core/src/main/java/hudson/util/ProcessTree.java
@@ -425,16 +425,17 @@ public synchronized List<String> getArguments() {
 
                     @Override
                     public synchronized EnvVars getEnvironmentVariables() {
-                        if(env==null)  
+                        if(env !=null)
+                          return env;
+                        env = new EnvVars();   
+
+                        try 
                         {
-                            try
-                            {
-                                env = new EnvVars(p.getEnvironmentVariables());
-                            } catch (WinpException e)
-                            {
-                                LOGGER.log(FINE, "Failed to get environment variable ", e);
-                            }                          
-                        }
+                           env.putAll(p.getEnvironmentVariables());
+                        } catch (WinpException e)
+                        {
+                           LOGGER.log(FINE, "Failed to get environment variable ", e);
+                        }                          
                         return env;
                     }
                 });