JENKINS-14483 Remaining Xvfb processes in matrix jobs

return empty environment instead of null from setUp method
jenkinsci · Sep 19, 2012 · a53ce0e6cf6acc96ad5a2020d1f0492e9e7b6492 · a53ce0e
1 parent b25ee74
commit a53ce0e6cf6acc96ad5a2020d1f0492e9e7b6492
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/xvfb/XvfbBuildWrapper.java b/src/main/java/org/jenkinsci/plugins/xvfb/XvfbBuildWrapper.java
@@ -251,8 +251,9 @@ public Environment setUp(@SuppressWarnings("rawtypes") final AbstractBuild build
         if (!launcher.isUnix()) {
             listener.getLogger().println(Messages.XvfbBuildWrapper_NotUnix());
 
-            // we'll abort
-            return null;
+            // we'll return empty environment
+            return new Environment() {
+            };
         }
 
         final XvfbEnvironment xvfbEnvironment = launchXvfb(build, launcher, listener);