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/BitbucketRepository.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/BitbucketRepository.java')
-rw-r--r-- | src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketRepository.java | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketRepository.java b/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketRepository.java index 660ec21..570a852 100644 --- a/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketRepository.java +++ b/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketRepository.java @@ -120,11 +120,20 @@ public class BitbucketRepository { pullRequest.getDestination().getCommit().getHash(), pullRequest.getAuthor().getCombinedUsername() ); - setBuildStatus(cause, BuildState.INPROGRESS, Jenkins.getInstance().getRootUrl()); + setBuildStatus(cause, BuildState.INPROGRESS, getInstance().getRootUrl()); this.builder.getTrigger().startJob(cause); } } + private Jenkins getInstance() { + final Jenkins instance = Jenkins.getInstance(); + if (instance == null){ + throw new IllegalStateException("Jenkins instance is NULL!"); + } + return instance; + } + + public void setBuildStatus(BitbucketCause cause, BuildState state, String buildUrl) { String comment = null; String sourceCommit = cause.getSourceCommitHash(); @@ -295,8 +304,8 @@ public class BitbucketRepository { sources.add(src); BitbucketBuildFilter filter = !this.trigger.getBranchesFilterBySCMIncludes() ? - BitbucketBuildFilter.InstanceByString(this.trigger.getBranchesFilter()) : - BitbucketBuildFilter.InstanceBySCM(sources, this.trigger.getBranchesFilter()); + BitbucketBuildFilter.instanceByString(this.trigger.getBranchesFilter()) : + BitbucketBuildFilter.instanceBySCM(sources, this.trigger.getBranchesFilter()); return filter.approved(cause); } |