p85947160
/
Gitee-Jenkins-Plugin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #349 from team-supercharge/fix-commit-status-updater-npe 

Fix NPE when updating commit status
This commit is contained in:
omorillo 2016-06-09 16:23:53 +02:00
parent 3f92edbd22 ef4f774d02
commit 16c95af768
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/dabsquared/gitlabjenkins/util/CommitStatusUpdater.java
View File

@ -7,6 +7,7 @@ import com.dabsquared.gitlabjenkins.gitlab.api.model.BuildState;
import hudson.EnvVars;
import hudson.model.Run;
import hudson.model.TaskListener;
import hudson.plugins.git.Revision;
import hudson.plugins.git.util.BuildData;
import jenkins.model.Jenkins;
import org.apache.commons.lang.StringUtils;
@ -33,9 +34,11 @@ public class CommitStatusUpdater {
println(listener, "No GitLab connection configured");
return;
}
String commitHash = getBuildRevision(build);
String buildUrl = getBuildUrl(build);
try {
String commitHash = getBuildRevision(build);
String buildUrl = getBuildUrl(build);
for (String gitlabProjectId : retrieveGitlabProjectIds(build, build.getEnvironment(listener))) {
try {
if (existsCommit(client, gitlabProjectId, commitHash)) {
@ -46,7 +49,7 @@ public class CommitStatusUpdater {
LOGGER.log(Level.SEVERE, String.format("Failed to update Gitlab commit status for project '%s'", gitlabProjectId), e);
}
}
} catch (IOException | InterruptedException e) {
} catch (IOException | InterruptedException | IllegalStateException e) {
printf(listener, "Failed to update Gitlab commit status: %s%n", e.getMessage());
}
}
@ -69,8 +72,13 @@ public class CommitStatusUpdater {
private static String getBuildRevision(Run<?, ?> build) {
BuildData action = build.getAction(BuildData.class);
Revision lastBuiltRevision = action.getLastBuiltRevision();
return action.getLastBuild(action.getLastBuiltRevision().getSha1()).getMarked().getSha1String();
if (lastBuiltRevision == null) {
throw new IllegalStateException("Last build has no associated commit");
}
return action.getLastBuild(lastBuiltRevision.getSha1()).getMarked().getSha1String();
}
private static boolean existsCommit(GitLabApi client, String gitlabProjectId, String commitHash) {