8000 Merge pull request #103 from lanwen/fix_JENKINS-32132 · github-cloud/github-plugin@2c193b4 · GitHub
[go: up one dir, main page]
Skip to content

Commit 2c193b4

Browse files
lanwenlanwen
committed
Merge pull request jenkinsci#103 from lanwen/fix_JENKINS-32132
[FIXES JENKINS-32132] Check status message is null (in case of wrong …
2 parents c8af6ec + 57d7870 commit 2c193b4

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

‎src/main/java/com/cloudbees/jenkins/GitHubCommitNotifier.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import static com.cloudbees.jenkins.Messages.GitHubCommitNotifier_DisplayName;
2929
import static com.cloudbees.jenkins.Messages.GitHubCommitNotifier_SettingCommitStatus;
3030
import static com.coravy.hudson.plugins.github.GithubProjectProperty.displayNameFor;
31+
import static com.google.common.base.Objects.firstNonNull;
3132
import static hudson.model.Result.FAILURE;
3233
import static hudson.model.Result.SUCCESS;
3334
import static hudson.model.Result.UNSTABLE;
@@ -41,8 +42,9 @@
4142
* @author <a href="mailto:nicolas.deloof@gmail.com">Nicolas De Loof</a>
4243
*/
4344
public class GitHubCommitNotifier extends Notifier {
45+
private static final ExpandableMessage DEFAULT_MESSAGE = new ExpandableMessage("");
4446

45-
private ExpandableMessage statusMessage = new ExpandableMessage("");
47+
private ExpandableMessage statusMessage = DEFAULT_MESSAGE;
4648

4749
private final String resultOnFailure;
4850
private static final Result[] SUPPORTED_RESULTS = {FAILURE, UNSTABLE, SUCCESS};
@@ -124,7 +126,8 @@ private void updateCommitStatus(@Nonnull AbstractBuild<?, ?> build,
124126
final String sha1 = ObjectId.toString(BuildDataHelper.getCommitSHA1(build));
125127

126128
StatusResult status = statusFrom(build);
127-
String message = defaultIfEmpty(statusMessage.expandAll(build, listener), status.getMsg());
129+
String message = defaultIfEmpty(firstNonNull(statusMessage, DEFAULT_MESSAGE)
130+
.expandAll(build, listener), status.getMsg());
128131
String contextName = displayNameFor(build.getProject());
129132

130133
for (GitHubRepositoryName name : GitHubRepositoryNameContributor.parseAssociatedNames(build.getProject())) {

‎src/main/java/com/cloudbees/jenkins/GitHubSetCommitStatusBuilder.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,14 @@
1919

2020
import static com.cloudbees.jenkins.Messages.GitHubCommitNotifier_SettingCommitStatus;
2121
import static com.coravy.hudson.plugins.github.GithubProjectProperty.displayNameFor;
22+
import static com.google.common.base.Objects.firstNonNull;
2223
import static org.apache.commons.lang3.StringUtils.defaultIfEmpty;
2324

2425
@Extension
2526
public class GitHubSetCommitStatusBuilder extends Builder {
26-
private ExpandableMessage statusMessage = new ExpandableMessage("");
27+
private static final ExpandableMessage DEFAULT_MESSAGE = new ExpandableMessage("");
28+
29+
private ExpandableMessage statusMessage = DEFAULT_MESSAGE;
2730

2831
@DataBoundConstructor
2932
public GitHubSetCommitStatusBuilder() {
@@ -50,7 +53,7 @@ public boolean perform(AbstractBuild<?, ?> build,
5053
BuildListener listener) throws InterruptedException, IOException {
5154
final String sha1 = ObjectId.toString(BuildDataHelper.getCommitSHA1(build));
5255
String message = defaultIfEmpty(
53-
statusMessage.expandAll(build, listener),
56+
firstNonNull(statusMessage, DEFAULT_MESSAGE).expandAll(build, listener),
5457
Messages.CommitNotifier_Pending(build.getDisplayName())
5558
);
5659
String contextName = displayNameFor(build.getProject());

0 commit comments

Comments
 (0)
0