From 02ede7f11c6fb28ca53fc240905cd1b140236f08 Mon Sep 17 00:00:00 2001 From: Robin Rosenberg Date: Sun, 1 Sep 2013 19:58:00 +0200 Subject: Avoid NPE when the default branch cannot be identified This is a normal condition that complicates debugging, i.e. when catching all NPE's. --- src/main/java/com/gitblit/utils/JGitUtils.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/gitblit/utils/JGitUtils.java b/src/main/java/com/gitblit/utils/JGitUtils.java index 8676d748..3f01eeaf 100644 --- a/src/main/java/com/gitblit/utils/JGitUtils.java +++ b/src/main/java/com/gitblit/utils/JGitUtils.java @@ -566,6 +566,8 @@ public class JGitUtils { try { if (tree == null) { ObjectId object = getDefaultBranch(repository); + if (object == null) + return null; RevCommit commit = rw.parseCommit(object); tree = commit.getTree(); } -- cgit v1.2.3 From 86dca9da11d66aba2104ab64fbe3affb5ebf0ff4 Mon Sep 17 00:00:00 2001 From: Robin Rosenberg Date: Sun, 1 Sep 2013 19:58:28 +0200 Subject: Don't crash with an NPE when the cache contains removed repositoried --- src/main/java/com/gitblit/GitBlit.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/gitblit/GitBlit.java b/src/main/java/com/gitblit/GitBlit.java index 6ea348d5..111e5951 100644 --- a/src/main/java/com/gitblit/GitBlit.java +++ b/src/main/java/com/gitblit/GitBlit.java @@ -3603,7 +3603,7 @@ public class GitBlit implements ServletContextListener { Date cutoff = CommitCache.instance().getCutoffDate(); for (String repositoryName : getRepositoryList()) { RepositoryModel model = getRepositoryModel(repositoryName); - if (model.hasCommits && model.lastChange.after(cutoff)) { + if (model != null && model.hasCommits && model.lastChange.after(cutoff)) { repoCount++; Repository repository = getRepository(repositoryName); for (RefModel ref : JGitUtils.getLocalBranches(repository, true, -1)) { -- cgit v1.2.3