Skip to content
Permalink
Browse files
JENKINS-14483 Remaining Xvfb processes in matrix jobs
fix NPE with Environment Injector Plugin installed
  • Loading branch information
Zoran Regvart committed Sep 19, 2012
1 parent a53ce0e commit 81e7a1ff832b99bf2652b022c56eb1e81c96163c
Showing with 4 additions and 2 deletions.
  1. +4 −2 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

0 comments on commit 81e7a1f

Please sign in to comment.