Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #724 from JoelJ/patch-1
[FIXED JENKINS-17025] NPE when checking if the executor is interrupted
  • Loading branch information
jglick committed Mar 1, 2013
2 parents db23077 + 179f757 commit 92fa6e5
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion core/src/main/java/hudson/model/Build.java
Expand Up @@ -200,7 +200,9 @@ private boolean build(BuildListener listener, Collection<Builder> steps) throws
LOGGER.fine(MessageFormat.format("{0} : {1} failed", Build.this.toString(), bs));
return false;
}
if (getExecutor().isInterrupted()) {

Executor executor = getExecutor();
if (executor != null && executor.isInterrupted()) {
// someone asked build interruption, let stop the build before trying to run another build step
throw new InterruptedException();
}
Expand Down

0 comments on commit 92fa6e5

Please sign in to comment.