opendev/gerrit
Code Issues Proposed changes

IncludedIn: Don't fail with NPE if ExternalIncludedIn returns null

Browse Source 
Change-Id: I1daf70677e58dbde22ab65f081c5e3eb5d1fd401
Signed-off-by: Edwin Kempin <ekempin@google.com>
This commit is contained in:
Edwin Kempin
2016-10-31 08:51:55 +01:00
parent aedc248365
commit 6d5a2d3ed9
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gerrit-server/src/main/java/com/google/gerrit/server/change/IncludedIn.java
View File

@@ -83,8 +83,11 @@ class IncludedIn implements RestReadView<ChangeResource> {
IncludedInResolver.Result d = IncludedInResolver.resolve(r, rw, rev);
Multimap<String, String> external = ArrayListMultimap.create();
for (ExternalIncludedIn ext : includedIn) {
external.putAll(ext.getIncludedIn(project.get(), rev.name(),
d.getTags(), d.getBranches()));
Multimap<String, String> extIncludedIns = ext.getIncludedIn(
project.get(), rev.name(), d.getTags(), d.getBranches());
if (extIncludedIns != null) {
external.putAll(extIncludedIns);
}
}
return new IncludedInInfo(d,
(!external.isEmpty() ? external.asMap() : null));