From b4ee41a33ce8b23f28684ec94afe250aab907538 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 18 Jun 2014 10:40:09 -0400
Subject: [PATCH] Merged #108 "Fix NPE when there are two repositories which only differ in case"
---
src/main/java/com/gitblit/manager/RepositoryManager.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gitblit/manager/RepositoryManager.java b/src/main/java/com/gitblit/manager/RepositoryManager.java
index e0721c7..6601336 100644
--- a/src/main/java/com/gitblit/manager/RepositoryManager.java
+++ b/src/main/java/com/gitblit/manager/RepositoryManager.java
@@ -702,7 +702,7 @@
// cached model
RepositoryModel model = repositoryListCache.get(repositoryKey);
- if (gcExecutor.isCollectingGarbage(model.name)) {
+ if (isCollectingGarbage(model.name)) {
// Gitblit is busy collecting garbage, use our cached model
RepositoryModel rm = DeepCopier.copy(model);
rm.isCollectingGarbage = true;
@@ -1287,7 +1287,7 @@
@Override
public void updateRepositoryModel(String repositoryName, RepositoryModel repository,
boolean isCreate) throws GitBlitException {
- if (gcExecutor.isCollectingGarbage(repositoryName)) {
+ if (isCollectingGarbage(repositoryName)) {
throw new GitBlitException(MessageFormat.format("sorry, Gitblit is busy collecting garbage in {0}",
repositoryName));
}
--
Gitblit v1.9.1