summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSascha Vogt <s.vogt@seeburger.de>2014-06-18 14:07:55 +0200
committerSascha Vogt <s.vogt@seeburger.de>2014-06-18 14:07:55 +0200
commit396e9bb50d7eca0d96da2c5fc5177a22f78d30b7 (patch)
tree6ef4f09438985578a66d00ff94c2aef273535e34 /src
parentede713df83d03be3ecf7b9c363cead25b52d27f9 (diff)
downloadgitblit-396e9bb50d7eca0d96da2c5fc5177a22f78d30b7.tar.gz
gitblit-396e9bb50d7eca0d96da2c5fc5177a22f78d30b7.zip
Fix NPE when there are two repositories which only differ in case
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/gitblit/manager/RepositoryManager.java4
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 e0721c7c..6601336e 100644
--- a/src/main/java/com/gitblit/manager/RepositoryManager.java
+++ b/src/main/java/com/gitblit/manager/RepositoryManager.java
@@ -702,7 +702,7 @@ public class RepositoryManager implements IRepositoryManager {
// 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 @@ public class RepositoryManager implements IRepositoryManager {
@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));
}