From a6c3d0aeffc9afc91e6f6dfd0de48e69e7d0721c Mon Sep 17 00:00:00 2001 From: Edwin Kempin Date: Mon, 31 Oct 2016 08:51:55 +0100 Subject: [PATCH 1/2] IncludedIn: Don't fail with NPE if ExternalIncludedIn returns null Change-Id: I1daf70677e58dbde22ab65f081c5e3eb5d1fd401 Signed-off-by: Edwin Kempin (cherry picked from commit 6d5a2d3ed9122b477937150c5b2a985c7c2505f7) --- .../java/com/google/gerrit/server/change/IncludedIn.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/IncludedIn.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/IncludedIn.java index 404fe750aa..344cb44a79 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/IncludedIn.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/IncludedIn.java @@ -83,8 +83,11 @@ class IncludedIn implements RestReadView { IncludedInResolver.Result d = IncludedInResolver.resolve(r, rw, rev); Multimap external = ArrayListMultimap.create(); for (ExternalIncludedIn ext : includedIn) { - external.putAll(ext.getIncludedIn(project.get(), rev.name(), - d.getTags(), d.getBranches())); + Multimap 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)); From 18d8f00aeb3049d40be5d392d630ffcf55a5fa28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Ar=C3=A8s?= Date: Thu, 3 Nov 2016 09:34:30 -0400 Subject: [PATCH 2/2] Remove unused import Change-Id: I5799cb58ec1cc2d01914a8633a3e6047fc6ff781 --- .../main/java/com/google/gerrit/sshd/ChangeArgumentParser.java | 1 - 1 file changed, 1 deletion(-) diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/ChangeArgumentParser.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/ChangeArgumentParser.java index d63662878d..7f95471d75 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/ChangeArgumentParser.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/ChangeArgumentParser.java @@ -15,7 +15,6 @@ package com.google.gerrit.sshd; import com.google.common.base.Function; -import com.google.common.base.Optional; import com.google.common.base.Predicates; import com.google.common.collect.FluentIterable; import com.google.gerrit.reviewdb.client.Change;