opendev/gerrit
Code Issues Proposed changes

Fix NullPointerException in ls-project command with --has-acl-for option

Browse Source 
Using --has-acl-for option for any groups that are not Gerrit groups(e.g.
LDAP group) was causing a NullPointerExcetion.

Use GroupsCollection instead of GroupCache so the groups from any
GroupBackend are resolved.

Change-Id: I11706ef3dbe4dcc7ca9d2ece1d641f5b0c7d66be
This commit is contained in:
Hugo Arès
2015-09-30 13:36:03 -04:00
parent 318953fdcd
commit aa1c92af96
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
gerrit-server/src/main/java/com/google/gerrit/server/project/ListProjects.java
View File

@@ -37,9 +37,9 @@ import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.OutputFormat; import com.google.gerrit.server.OutputFormat;
import com.google.gerrit.server.StringUtil; import com.google.gerrit.server.StringUtil;
import com.google.gerrit.server.WebLinks; import com.google.gerrit.server.WebLinks;
import com.google.gerrit.server.account.GroupCache;
import com.google.gerrit.server.account.GroupControl; import com.google.gerrit.server.account.GroupControl;
import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.server.group.GroupsCollection;
import com.google.gerrit.server.util.RegexListSearcher; import com.google.gerrit.server.util.RegexListSearcher;
import com.google.gerrit.server.util.TreeFormatter; import com.google.gerrit.server.util.TreeFormatter;
import com.google.gson.reflect.TypeToken; import com.google.gson.reflect.TypeToken;
@@ -108,7 +108,7 @@ public class ListProjects implements RestReadView<TopLevelResource> {
private final CurrentUser currentUser; private final CurrentUser currentUser;
private final ProjectCache projectCache; private final ProjectCache projectCache;
private final GroupCache groupCache; private final GroupsCollection groupsCollection;
private final GroupControl.Factory groupControlFactory; private final GroupControl.Factory groupControlFactory;
private final GitRepositoryManager repoManager; private final GitRepositoryManager repoManager;
private final ProjectNode.Factory projectNodeFactory; private final ProjectNode.Factory projectNodeFactory;
@@ -190,13 +190,16 @@ public class ListProjects implements RestReadView<TopLevelResource> {
private AccountGroup.UUID groupUuid; private AccountGroup.UUID groupUuid;
@Inject @Inject
protected ListProjects(CurrentUser currentUser, ProjectCache projectCache, protected ListProjects(CurrentUser currentUser,
GroupCache groupCache, GroupControl.Factory groupControlFactory, ProjectCache projectCache,
GitRepositoryManager repoManager, ProjectNode.Factory projectNodeFactory, GroupsCollection groupsCollection,
GroupControl.Factory groupControlFactory,
GitRepositoryManager repoManager,
ProjectNode.Factory projectNodeFactory,
WebLinks webLinks) { WebLinks webLinks) {
this.currentUser = currentUser; this.currentUser = currentUser;
this.projectCache = projectCache; this.projectCache = projectCache;
this.groupCache = groupCache; this.groupsCollection = groupsCollection;
this.groupControlFactory = groupControlFactory; this.groupControlFactory = groupControlFactory;
this.repoManager = repoManager; this.repoManager = repoManager;
this.projectNodeFactory = projectNodeFactory; this.projectNodeFactory = projectNodeFactory;
@@ -279,7 +282,7 @@ public class ListProjects implements RestReadView<TopLevelResource> {
break; break;
} }
if (!pctl.getLocalGroups().contains( if (!pctl.getLocalGroups().contains(
GroupReference.forGroup(groupCache.get(groupUuid)))) { GroupReference.forGroup(groupsCollection.parseId(groupUuid.get())))) {
continue; continue;
} }
} }