Fixed JENKINS-8614 ProcessTreeTest fails on Windows

97c28e0a · Limin Wang · limin wang · 70d8a6fa · 97c28e0a
隐藏空白更改
内联并排

Showing with 10 addition and 1 deletion

core/src/main/java/hudson/util/ProcessTree.java core/src/main/java/hudson/util/ProcessTree.java +10 -1

未找到文件。
--- a/core/src/main/java/hudson/util/ProcessTree.java
+++ b/core/src/main/java/hudson/util/ProcessTree.java
@@ -424,7 +424,16 @@ public abstract class ProcessTree implements Iterable<OSProcess>, IProcessTree,

                    @Override
                    public synchronized EnvVars getEnvironmentVariables() {
-                        if(env==null)   env = new EnvVars(p.getEnvironmentVariables());
+                        if(env==null)  
+                        {
+                            try
+                            {
+                                env = new EnvVars(p.getEnvironmentVariables());
+                            } catch (WinpException e)
+                            {
+                                LOGGER.log(FINEST, "Failed to get environment variable ", e);
+                            }                          
+                        }
                        return env;
                    }
                });