Sascha Vogt
2014-06-18 396e9bb50d7eca0d96da2c5fc5177a22f78d30b7
Fix NPE when there are two repositories which only differ in case
1 files modified
4 ■■■■ changed files
src/main/java/com/gitblit/manager/RepositoryManager.java 4 ●●●● patch | view | raw | blame | history
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));
        }