Browse Source

Catch some potential NPEs

tags/v1.7.0
James Moger 8 years ago
parent
commit
def01db5f7

+ 7
- 0
src/main/java/com/gitblit/manager/RepositoryManager.java View File

@@ -1113,9 +1113,16 @@ public class RepositoryManager implements IRepositoryManager {
// find the root, cached
String key = getRepositoryKey(repository);
RepositoryModel model = repositoryListCache.get(key);
if (model == null) {
return null;
}

while (model.originRepository != null) {
String originKey = getRepositoryKey(model.originRepository);
model = repositoryListCache.get(originKey);
if (model == null) {
return null;
}
}
ForkModel root = getForkModelFromCache(model.name);
return root;

+ 3
- 0
src/main/java/com/gitblit/wicket/pages/ForksPage.java View File

@@ -136,6 +136,9 @@ public class ForksPage extends RepositoryPage {
protected List<FlatFork> flatten(ForkModel node, int level) {
List<FlatFork> list = new ArrayList<FlatFork>();
if (node == null) {
return list;
}
list.add(new FlatFork(node.repository, level));
if (!node.isLeaf()) {
for (ForkModel fork : node.forks) {

Loading…
Cancel
Save