From 4e317ed7cd34dbc01169d7b808b06748e33d26db Mon Sep 17 00:00:00 2001 From: Liren Tu Date: Fri, 8 Sep 2017 20:08:50 -0700 Subject: [PATCH] Fixed #282 o Check the correct parameter when converting cause to a BuildCause object. --- ReleaseNotes.md | 5 +++++ .../java/com/offbytwo/jenkins/model/BuildWithDetails.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 2c43e996..f0f7142b 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -2,6 +2,11 @@ ## Release 0.3.8 (NOT RELEASED YET) + * [Fixed Issue 282][issue-282] + + `NullPointerException` may be thrown if `upstreamUrl` is `null` when + converting cause to `BuildCause` object. + * [Fixed Issue 268][issue-268] NullPointerException is thrown unless isRunning() is called first. diff --git a/jenkins-client/src/main/java/com/offbytwo/jenkins/model/BuildWithDetails.java b/jenkins-client/src/main/java/com/offbytwo/jenkins/model/BuildWithDetails.java index 9812a00d..2feea4f9 100644 --- a/jenkins-client/src/main/java/com/offbytwo/jenkins/model/BuildWithDetails.java +++ b/jenkins-client/src/main/java/com/offbytwo/jenkins/model/BuildWithDetails.java @@ -290,7 +290,7 @@ private BuildCause convertToBuildCause(Map cause) { } String upstreamUrl = (String) cause.get("upstreamUrl"); - if (!Strings.isNullOrEmpty(upstreamProject)) { + if (!Strings.isNullOrEmpty(upstreamUrl)) { cause_object.setUpstreamUrl(upstreamUrl); }