Merge pull request #785 from vjuranek/JENKINS-18024

[FIXED JENKINS-18024] Avoid NPE when checking if reason why in the queue has been changed
jenkinsci · May 28, 2013 · aa657d7 · aa657d7
2 parents 1db5de0 + b8b9b71
commit aa657d7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/core/src/main/java/hudson/matrix/DefaultMatrixExecutionStrategyImpl.java b/core/src/main/java/hudson/matrix/DefaultMatrixExecutionStrategyImpl.java
@@ -314,7 +314,7 @@ private MatrixRun waitForCompletion(MatrixBuildExecution exec, MatrixConfigurati
             if(qi!=null) {
                 // if the build seems to be stuck in the queue, display why
                 String why = qi.getWhy();
-                if(!why.equals(whyInQueue) && System.currentTimeMillis()-startTime>5000) {
+                if(why != null && !why.equals(whyInQueue) && System.currentTimeMillis()-startTime>5000) {
                     listener.getLogger().print("Configuration " + ModelHyperlinkNote.encodeTo(c)+" is still in the queue: ");
                     qi.getCauseOfBlockage().print(listener); //this is still shown on the same line
                     whyInQueue = why;