Merged #108 "Fix NPE when there are two repositories which only differ in c...

James Moger

2014-06-18 b4ee41a33ce8b23f28684ec94afe250aab907538

Merged #108 "Fix NPE when there are two repositories which only differ in case"

 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));
        }