Browse Source

Merge branch 'ticket/83' into develop

tags/v1.6.0
James Moger 10 years ago
parent
commit
93b795c6e4
1 changed files with 3 additions and 2 deletions
  1. 3
    2
      src/main/java/com/gitblit/manager/RepositoryManager.java

+ 3
- 2
src/main/java/com/gitblit/manager/RepositoryManager.java View File

// http://stackoverflow.com/questions/17183110 // http://stackoverflow.com/questions/17183110
repositoryName = repositoryName.replace("%7E", "~").replace("%7e", "~"); repositoryName = repositoryName.replace("%7E", "~").replace("%7e", "~");


if (!repositoryListCache.containsKey(repositoryName)) {
String repositoryKey = repositoryName.toLowerCase();
if (!repositoryListCache.containsKey(repositoryKey)) {
RepositoryModel model = loadRepositoryModel(repositoryName); RepositoryModel model = loadRepositoryModel(repositoryName);
if (model == null) { if (model == null) {
return null; return null;
} }


// cached model // cached model
RepositoryModel model = repositoryListCache.get(repositoryName.toLowerCase());
RepositoryModel model = repositoryListCache.get(repositoryKey);


if (gcExecutor.isCollectingGarbage(model.name)) { if (gcExecutor.isCollectingGarbage(model.name)) {
// Gitblit is busy collecting garbage, use our cached model // Gitblit is busy collecting garbage, use our cached model

Loading…
Cancel
Save