opendev/gerrit
Code Issues Proposed changes

Merge "GetRelated: Fix NPE when a patch set has no groups"

Browse Source
This commit is contained in:
Dave Borowitz
2015-10-29 19:00:32 +00:00
committed by Gerrit Code Review
parent 0677e88f24 8d8fc27f35
commit 16355b9a1b
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gerrit-server/src/main/java/com/google/gerrit/server/change/GetRelated.java
View File

@@ -24,7 +24,6 @@ import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.CommonConverters; import com.google.gerrit.server.CommonConverters;
import com.google.gerrit.server.change.RelatedChangesSorter.PatchSetData; import com.google.gerrit.server.change.RelatedChangesSorter.PatchSetData;
import com.google.gerrit.server.git.GroupCollector;
import com.google.gerrit.server.query.change.ChangeData; import com.google.gerrit.server.query.change.ChangeData;
import com.google.gerrit.server.query.change.InternalChangeQuery; import com.google.gerrit.server.query.change.InternalChangeQuery;
import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.OrmException;
@@ -67,15 +66,14 @@ public class GetRelated implements RestReadView<RevisionResource> {
private List<ChangeAndCommit> getRelated(RevisionResource rsrc) private List<ChangeAndCommit> getRelated(RevisionResource rsrc)
throws OrmException, IOException { throws OrmException, IOException {
if (GroupCollector.getGroups(rsrc).isEmpty()) { Set<String> groups = getAllGroups(rsrc.getChange().getId());
if (groups.isEmpty()) {
return Collections.emptyList(); return Collections.emptyList();
} }
List<ChangeData> cds = queryProvider.get() List<ChangeData> cds = queryProvider.get()
.enforceVisibility(true) .enforceVisibility(true)
.byProjectGroups( .byProjectGroups(rsrc.getChange().getProject(), groups);
rsrc.getChange().getProject(),
getAllGroups(rsrc.getChange().getId()));
if (cds.isEmpty()) { if (cds.isEmpty()) {
return Collections.emptyList(); return Collections.emptyList();
} if (cds.size() == 1 } if (cds.size() == 1