From 3e20db09ec088158a255eb6cd5d3d770a2ecfaee Mon Sep 17 00:00:00 2001 From: Edwin Kempin Date: Mon, 26 Mar 2018 11:14:49 +0200 Subject: [PATCH] GetAuditLog: Fix NPE if group UUID cannot be resolved A group UUID cannot be resolved if there is no groupback that handles it. This can e.g. happen if the singleusergroup was used and single user groups have been added to Gerrit groups, but then the singleusergroup plugin was uninstalled. Change-Id: I87b83c3904172e8ff32cfd07c15e9a9951921c71 Signed-off-by: Edwin Kempin --- .../main/java/com/google/gerrit/server/group/GetAuditLog.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/GetAuditLog.java b/gerrit-server/src/main/java/com/google/gerrit/server/group/GetAuditLog.java index 8c94f65f12..ba83e24175 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/group/GetAuditLog.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/group/GetAuditLog.java @@ -102,7 +102,9 @@ public class GetAuditLog implements RestReadView { GroupDescription.Basic groupDescription = groupBackend.get(includedGroupUUID); member = new GroupInfo(); member.id = Url.encode(includedGroupUUID.get()); - member.name = groupDescription.getName(); + if (groupDescription != null) { + member.name = groupDescription.getName(); + } } auditEvents.add(