diff options
| author | James Moger <james.moger@gitblit.com> | 2014-06-18 08:40:09 -0600 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-06-18 08:40:09 -0600 |
| commit | b4ee41a33ce8b23f28684ec94afe250aab907538 (patch) | |
| tree | 6ef4f09438985578a66d00ff94c2aef273535e34 | |
| parent | ede713df83d03be3ecf7b9c363cead25b52d27f9 (diff) | |
| parent | 396e9bb50d7eca0d96da2c5fc5177a22f78d30b7 (diff) | |
| download | gitblit-b4ee41a33ce8b23f28684ec94afe250aab907538.tar.gz gitblit-b4ee41a33ce8b23f28684ec94afe250aab907538.zip | |
Merged #108 "Fix NPE when there are two repositories which only differ in case"
| -rw-r--r-- | 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 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)); } |