opendev/gerrit
Code Issues Proposed changes

Avoid NPE when ChangeData.commitFooters() returns null

Browse Source 
Change-Id: I02d1e43dfa507e16c51dab6b27005fe5760ab93b
This commit is contained in:
Joerg Zieren
2019-09-16 16:09:13 +02:00
parent 84c535cd45
commit 4c7f255124
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/com/google/gerrit/server/config/TrackingFooters.java
View File

@@ -37,9 +37,6 @@ public class TrackingFooters {
public ListMultimap<String, String> extract(List<FooterLine> lines) { public ListMultimap<String, String> extract(List<FooterLine> lines) {
ListMultimap<String, String> r = MultimapBuilder.hashKeys().arrayListValues().build(); ListMultimap<String, String> r = MultimapBuilder.hashKeys().arrayListValues().build();
if (lines == null) {
return r;
}
for (FooterLine footer : lines) { for (FooterLine footer : lines) {
for (TrackingFooter config : trackingFooters) { for (TrackingFooter config : trackingFooters) {

3
java/com/google/gerrit/server/query/change/ChangeData.java
View File

@@ -543,10 +543,11 @@ public class ChangeData {
return commitMessage; return commitMessage;
} }
/** Returns the list of commit footers (which may be empty). */
public List<FooterLine> commitFooters() { public List<FooterLine> commitFooters() {
if (commitFooters == null) { if (commitFooters == null) {
if (!loadCommitData()) { if (!loadCommitData()) {
return null; return ImmutableList.of();
} }
} }
return commitFooters; return commitFooters;