Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added a extra check in if condition to avoid null pointer exception #1651

Closed
wants to merge 4 commits into from
Closed

Added a extra check in if condition to avoid null pointer exception #1651

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fbce685
added a extra check in if condition to avoid null pointer exception
AniketNS Apr 10, 2024
81f9cb4
Added a condition to check if mergeCommitMessage is 'not' null
AniketNS Apr 10, 2024
8a1b688
Merge branch 'master' into aniket
AniketNS Apr 13, 2024
20c5fdc
Merge branch 'master' into aniket
krisstern Aug 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/main/java/com/dabsquared/gitlabjenkins/workflow/AcceptGitLabMergeRequestStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,9 @@
}

private String getCommitMessage(MergeRequest mergeRequest) {
if (!step.useMRDescription) return step.mergeCommitMessage;
if (!step.useMRDescription || !StringUtils.isEmpty(step.mergeCommitMessage)) {
return step.mergeCommitMessage;

Check warning on line 126 in src/main/java/com/dabsquared/gitlabjenkins/workflow/AcceptGitLabMergeRequestStep.java

View check run for this annotation

ci.jenkins.io / Code Coverage

Not covered lines 

Lines 125-126 are not covered by tests
}

return String.format(
"Merge branch '%s' into '%s'%n%n%s%n%n%s%n%nSee merge request !%d",
Expand Down