From 9effe1630d97039b3e01cd9b58ed07e75be1d63c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 25 Feb 2013 08:40:30 -0500
Subject: [PATCH] Merge pull request #75 from thefake/master
---
src/com/gitblit/SyndicationServlet.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/com/gitblit/SyndicationServlet.java b/src/com/gitblit/SyndicationServlet.java
index 4c542b6..baaf7eb 100644
--- a/src/com/gitblit/SyndicationServlet.java
+++ b/src/com/gitblit/SyndicationServlet.java
@@ -210,7 +210,13 @@
for (String name : repositories) {
Repository repository = GitBlit.self().getRepository(name);
RepositoryModel model = GitBlit.self().getRepositoryModel(name);
-
+
+ if (repository == null) {
+ if (model.isCollectingGarbage) {
+ logger.warn(MessageFormat.format("Temporarily excluding {0} from feed, busy collecting garbage", name));
+ }
+ continue;
+ }
if (!isProjectFeed) {
// single-repository feed
feedName = model.name;
@@ -227,7 +233,7 @@
commits = JGitUtils.searchRevlogs(repository, objectId, searchString, searchType,
offset, length);
}
- Map<ObjectId, List<RefModel>> allRefs = JGitUtils.getAllRefs(repository);
+ Map<ObjectId, List<RefModel>> allRefs = JGitUtils.getAllRefs(repository, model.showRemoteBranches);
// convert RevCommit to SyndicatedEntryModel
for (RevCommit commit : commits) {
--
Gitblit v1.9.1