diff options
author | Martin Damovsky <martin.damovsky@gmail.com> | 2017-02-22 22:48:03 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-22 22:48:03 +0100 |
commit | 941701577b170d8778079db854f02bb1d7bb032f (patch) | |
tree | 5ab4a4e27ca78dfc17c14e044dfb2b366b8d72da /src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger.java | |
parent | d7700dca7edda31c0aa7da89dc0ed7f1450dd2d5 (diff) | |
parent | 8717b231004ce0f4446d02e1506111b4ec13f86a (diff) | |
download | bbprb-941701577b170d8778079db854f02bb1d7bb032f.tar.gz |
Merge pull request #109 from jenkinsci/master
merge release 1.4.21 to basement project
Diffstat (limited to 'src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger.java')
-rw-r--r-- | src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger.java | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger.java b/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger.java index 846ecb5..40bc215 100644 --- a/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger.java +++ b/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger.java @@ -202,7 +202,7 @@ public class BitbucketBuildTrigger extends Trigger<Job<?, ?>> { private void cancelPreviousJobsInQueueThatMatch(@Nonnull BitbucketCause bitbucketCause) { logger.fine("Looking for queued jobs that match PR ID: " + bitbucketCause.getPullRequestId()); - Queue queue = Jenkins.getInstance().getQueue(); + Queue queue = getInstance().getQueue(); for (Queue.Item item : queue.getItems()) { if (hasCauseFromTheSamePullRequest(item.getCauses(), bitbucketCause)) { logger.info("Canceling item in queue: " + item); @@ -211,6 +211,14 @@ public class BitbucketBuildTrigger extends Trigger<Job<?, ?>> { } } + private Jenkins getInstance() { + final Jenkins instance = Jenkins.getInstance(); + if (instance == null){ + throw new IllegalStateException("Jenkins instance is NULL!"); + } + return instance; + } + private void abortRunningJobsThatMatch(@Nonnull BitbucketCause bitbucketCause) { logger.fine("Looking for running jobs that match PR ID: " + bitbucketCause.getPullRequestId()); for (Object o : job.getBuilds()) { @@ -218,7 +226,11 @@ public class BitbucketBuildTrigger extends Trigger<Job<?, ?>> { Build build = (Build) o; if (build.isBuilding() && hasCauseFromTheSamePullRequest(build.getCauses(), bitbucketCause)) { logger.info("Aborting build: " + build + " since PR is outdated"); - build.getExecutor().interrupt(Result.ABORTED); + final Executor executor = build.getExecutor(); + if (executor == null){ + throw new IllegalStateException("Executor can't be NULL"); + } + executor.interrupt(Result.ABORTED); } } } |