opendev/gerrit
Code Issues Proposed changes

Merge "Fix NPE in /projects/{name}/children?recursive when a parent is missing" into stable-2.9

Browse Source
This commit is contained in:
David Pursehouse 2014-09-05 14:58:44 +00:00 committed by Gerrit Code Review
commit b8bb7c1109
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gerrit-server/src/main/java/com/google/gerrit/server/project/ListChildProjects.java
View File

@ -25,6 +25,7 @@ import com.google.inject.Inject;
import org.kohsuke.args4j.Option;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@ -94,7 +95,13 @@ public class ListChildProjects implements RestReadView<ProjectResource> {
node.addChild(key);
}
}
return getChildProjectsRecursively(projects.get(parent));
ProjectNode n = projects.get(parent);
if (n != null) {
return getChildProjectsRecursively(n);
} else {
return Collections.emptyList();
}
}
private List<ProjectInfo> getChildProjectsRecursively(ProjectNode p) {