From def01db5f7dc1c607026528eed1dfd75c6e59779 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Wed, 18 Nov 2015 09:19:23 -0500 Subject: [PATCH] Catch some potential NPEs --- src/main/java/com/gitblit/wicket/pages/ForksPage.java | 3 +++ src/main/java/com/gitblit/manager/RepositoryManager.java | 7 +++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/gitblit/manager/RepositoryManager.java b/src/main/java/com/gitblit/manager/RepositoryManager.java index 027ba23..e2e4de6 100644 --- a/src/main/java/com/gitblit/manager/RepositoryManager.java +++ b/src/main/java/com/gitblit/manager/RepositoryManager.java @@ -1113,9 +1113,16 @@ // 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; diff --git a/src/main/java/com/gitblit/wicket/pages/ForksPage.java b/src/main/java/com/gitblit/wicket/pages/ForksPage.java index 93fc9fa..045f5f7 100644 --- a/src/main/java/com/gitblit/wicket/pages/ForksPage.java +++ b/src/main/java/com/gitblit/wicket/pages/ForksPage.java @@ -136,6 +136,9 @@ 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) { -- Gitblit v1.9.1