From c86217804308dc85eda76d8de03310b6894c22a6 Mon Sep 17 00:00:00 2001 From: Joseph Montanari - SESA110790 Date: Wed, 11 Jan 2017 12:22:13 -0500 Subject: [PATCH 1/2] Fix jenkins-40998 --- .../bitbucket/BitbucketBuildStatusNotifierStep.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusNotifierStep.java b/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusNotifierStep.java index 7a47d65..283a790 100644 --- a/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusNotifierStep.java +++ b/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusNotifierStep.java @@ -83,6 +83,14 @@ public String getCredentialsId() { private String buildState; public String getBuildState() { return this.buildState; } + + private boolean overrideLatestBuild; + public boolean isOverrideLatestBuild() { return this.overrideLatestBuild; } + @DataBoundSetter public void setOverrideLatestBuild(boolean overrideLatestBuild) { + this.overrideLatestBuild = overrideLatestBuild; + +} + @DataBoundConstructor public BitbucketBuildStatusNotifierStep(final String buildState) { this.credentialsId = credentialsId; @@ -186,7 +194,7 @@ public Void run() throws Exception { BitbucketBuildStatus buildStatus = new BitbucketBuildStatus(buildState, buildKey, buildUrl, buildName, buildDescription); - BitbucketBuildStatusHelper.notifyBuildStatus(step.getCredentials(build), false, build, taskListener, buildStatus); + BitbucketBuildStatusHelper.notifyBuildStatus(step.getCredentials(build), step.isOverrideLatestBuild(), build, taskListener, buildStatus); if(buildState.equals(BitbucketBuildStatus.FAILED)) { throw new Exception(buildDescription); From 4cdc78c5ed04d8f1234fddd654459b914af643ea Mon Sep 17 00:00:00 2001 From: Joseph Montanari - SESA110790 Date: Wed, 11 Jan 2017 14:55:45 -0500 Subject: [PATCH 2/2] Fix to use get instead of is. Set a default value --- .../BitbucketBuildStatusNotifierStep.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusNotifierStep.java b/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusNotifierStep.java index 283a790..721dbcb 100644 --- a/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusNotifierStep.java +++ b/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusNotifierStep.java @@ -84,19 +84,20 @@ public String getCredentialsId() { public String getBuildState() { return this.buildState; } - private boolean overrideLatestBuild; - public boolean isOverrideLatestBuild() { return this.overrideLatestBuild; } - @DataBoundSetter public void setOverrideLatestBuild(boolean overrideLatestBuild) { + private boolean overrideLatestBuild=false; + public boolean getOverrideLatestBuild() {return this.overrideLatestBuild;} + + @DataBoundSetter + public void setOverrideLatestBuild(boolean overrideLatestBuild) { this.overrideLatestBuild = overrideLatestBuild; - -} + } @DataBoundConstructor public BitbucketBuildStatusNotifierStep(final String buildState) { this.credentialsId = credentialsId; this.buildState = buildState; } - + @Override public DescriptorImpl getDescriptor() { return Jenkins.getInstance().getDescriptorByType(DescriptorImpl.class); @@ -194,7 +195,7 @@ public Void run() throws Exception { BitbucketBuildStatus buildStatus = new BitbucketBuildStatus(buildState, buildKey, buildUrl, buildName, buildDescription); - BitbucketBuildStatusHelper.notifyBuildStatus(step.getCredentials(build), step.isOverrideLatestBuild(), build, taskListener, buildStatus); + BitbucketBuildStatusHelper.notifyBuildStatus(step.getCredentials(build), step.getOverrideLatestBuild(), build, taskListener, buildStatus); if(buildState.equals(BitbucketBuildStatus.FAILED)) { throw new Exception(buildDescription);