JENKINS-23267 NullPointerException in XvfbBuildWrapper.setUp when

configured without node label restrictions
jenkinsci · Jun 2, 2014 · b6573ff · b6573ff
1 parent 00c95d6
commit b6573ff
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/main/java/org/jenkinsci/plugins/xvfb/XvfbBuildWrapper.java b/src/main/java/org/jenkinsci/plugins/xvfb/XvfbBuildWrapper.java
@@ -565,7 +565,7 @@ public void makeBuildVariables(@SuppressWarnings("rawtypes") final AbstractBuild
 
     @Override
     public Environment setUp(@SuppressWarnings("rawtypes") final AbstractBuild build, final Launcher launcher, final BuildListener listener) throws IOException, InterruptedException {
-        if (assignedLabels != null || assignedLabels.trim().isEmpty()) {
+        if (assignedLabels != null && !assignedLabels.trim().isEmpty()) {
             final Label label;
             try {
                 label = Label.parseExpression(assignedLabels);