From 3983a120127805bff913f0dea3455b080a6de831 Mon Sep 17 00:00:00 2001 From: James Moger Date: Fri, 27 Jun 2014 23:30:04 -0400 Subject: [PATCH] Fix project model creation bug with forced lowercase names --- .../java/com/gitblit/manager/ProjectManager.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/gitblit/manager/ProjectManager.java b/src/main/java/com/gitblit/manager/ProjectManager.java index b30f4f17..666f5210 100644 --- a/src/main/java/com/gitblit/manager/ProjectManager.java +++ b/src/main/java/com/gitblit/manager/ProjectManager.java @@ -178,19 +178,20 @@ public class ProjectManager implements IProjectManager { map.put("", configs.get("")); for (RepositoryModel model : repositoryManager.getRepositoryModels(user)) { - String rootPath = StringUtils.getRootPath(model.name).toLowerCase(); - if (!map.containsKey(rootPath)) { + String projectPath = StringUtils.getRootPath(model.name); + String projectKey = projectPath.toLowerCase(); + if (!map.containsKey(projectKey)) { ProjectModel project; - if (configs.containsKey(rootPath)) { + if (configs.containsKey(projectKey)) { // clone the project model because it's repository list will // be tailored for the requesting user - project = DeepCopier.copy(configs.get(rootPath)); + project = DeepCopier.copy(configs.get(projectKey)); } else { - project = new ProjectModel(rootPath); + project = new ProjectModel(projectPath); } - map.put(rootPath, project); + map.put(projectKey, project); } - map.get(rootPath).addRepository(model); + map.get(projectKey).addRepository(model); } // sort projects, root project first -- 2.39.5