JENKINS-14483 Remaining Xvfb processes in matrix jobs

fix NPE with Environment Injector Plugin installed
jenkinsci · Sep 19, 2012 · 81e7a1f · 81e7a1f
1 parent a53ce0e
commit 81e7a1f
Showing 1 changed file with 4 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
@@ -241,9 +241,11 @@ private XvfbEnvironment launchXvfb(@SuppressWarnings("rawtypes") final AbstractB
     public void makeBuildVariables(@SuppressWarnings("rawtypes") final AbstractBuild build, final Map<String, String> variables) {
         final XvfbEnvironment xvfbEnvironment = build.getAction(XvfbEnvironment.class);
 
-        final int displayNameUsed = xvfbEnvironment.getDisplayNameUsed();
+        if (xvfbEnvironment != null) {
+            final int displayNameUsed = xvfbEnvironment.getDisplayNameUsed();
 
-        variables.put("DISPLAY", ":" + displayNameUsed);
+            variables.put("DISPLAY", ":" + displayNameUsed);
+        }
     }
 
     @Override