From 618d1691dc0003c8243942354d81dd35a195a94e Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Tue, 06 Nov 2012 17:15:18 -0500 Subject: [PATCH] Fixed regression in setting up Lucene executor --- src/com/gitblit/wicket/panels/BranchesPanel.java | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/com/gitblit/wicket/panels/BranchesPanel.java b/src/com/gitblit/wicket/panels/BranchesPanel.java index 3ca02cb..cfe9f5f 100644 --- a/src/com/gitblit/wicket/panels/BranchesPanel.java +++ b/src/com/gitblit/wicket/panels/BranchesPanel.java @@ -166,6 +166,14 @@ @Override public void onClick() { Repository r = GitBlit.self().getRepository(repositoryModel.name); + if (r == null) { + if (GitBlit.self().isCollectingGarbage(repositoryModel.name)) { + error(MessageFormat.format(getString("gb.busyCollectingGarbage"), repositoryModel.name)); + } else { + error(MessageFormat.format("Failed to find repository {0}", repositoryModel.name)); + } + return; + } boolean success = JGitUtils.deleteBranchRef(r, entry.getName()); r.close(); if (success) { -- Gitblit v1.9.1