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

Merge pull request #216 from team-supercharge/fix-gitlabUserEmail-is-null 

Fix NPE when author email is not available
This commit is contained in:
coder-hugo 2016-03-13 22:01:25 +01:00
parent efca132b27 b24bf6f539
commit daeb8665d5
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/dabsquared/gitlabjenkins/GitLabPushTrigger.java
View File

@ -404,7 +404,11 @@ public class GitLabPushTrigger extends Trigger<Job<?, ?>> {
values.put("gitlabActionType", new StringParameterValue("gitlabActionType", "MERGE"));
if (req.getObjectAttribute().getAuthor() != null) {
values.put("gitlabUserName", new StringParameterValue("gitlabUserName", req.getObjectAttribute().getAuthor().getName()));
values.put("gitlabUserEmail", new StringParameterValue("gitlabUserEmail", req.getObjectAttribute().getAuthor().getEmail()));
String email = req.getObjectAttribute().getAuthor().getEmail();
if (email != null) {
values.put("gitlabUserEmail", new StringParameterValue("gitlabUserEmail", email));
}
}
values.put("gitlabMergeRequestTitle", new StringParameterValue("gitlabMergeRequestTitle", req.getObjectAttribute().getTitle()));
values.put("gitlabMergeRequestId", new StringParameterValue("gitlabMergeRequestId", req.getObjectAttribute().getIid().toString()));