From c51db7be8f6f48ddebff5053915be68f77e3fc94 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 23 May 2014 09:20:25 -0400
Subject: [PATCH] Merged #85 "Tag server-side merges when incremental push tags are enabled"
---
src/main/java/com/gitblit/manager/RepositoryManager.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gitblit/manager/RepositoryManager.java b/src/main/java/com/gitblit/manager/RepositoryManager.java
index c141f08..31d6b34 100644
--- a/src/main/java/com/gitblit/manager/RepositoryManager.java
+++ b/src/main/java/com/gitblit/manager/RepositoryManager.java
@@ -464,6 +464,8 @@
public void resetRepositoryCache(String repositoryName) {
removeFromCachedRepositoryList(repositoryName);
clearRepositoryMetadataCache(repositoryName);
+ // force a reload of the repository data (ticket-82, issue-433)
+ getRepositoryModel(repositoryName);
}
/**
@@ -682,7 +684,8 @@
// http://stackoverflow.com/questions/17183110
repositoryName = repositoryName.replace("%7E", "~").replace("%7e", "~");
- if (!repositoryListCache.containsKey(repositoryName)) {
+ String repositoryKey = repositoryName.toLowerCase();
+ if (!repositoryListCache.containsKey(repositoryKey)) {
RepositoryModel model = loadRepositoryModel(repositoryName);
if (model == null) {
return null;
@@ -692,7 +695,7 @@
}
// cached model
- RepositoryModel model = repositoryListCache.get(repositoryName.toLowerCase());
+ RepositoryModel model = repositoryListCache.get(repositoryKey);
if (gcExecutor.isCollectingGarbage(model.name)) {
// Gitblit is busy collecting garbage, use our cached model
--
Gitblit v1.9.1