From 396e9bb50d7eca0d96da2c5fc5177a22f78d30b7 Mon Sep 17 00:00:00 2001
From: Sascha Vogt <s.vogt@seeburger.de>
Date: Wed, 18 Jun 2014 08:07:55 -0400
Subject: [PATCH] Fix NPE when there are two repositories which only differ in case
---
src/main/java/com/gitblit/utils/CommitCache.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gitblit/utils/CommitCache.java b/src/main/java/com/gitblit/utils/CommitCache.java
index fd3a659..a3963f5 100644
--- a/src/main/java/com/gitblit/utils/CommitCache.java
+++ b/src/main/java/com/gitblit/utils/CommitCache.java
@@ -225,7 +225,8 @@
List<RepositoryCommit> commits = new ArrayList<RepositoryCommit>();
for (RevCommit commit : JGitUtils.getRevLog(repository, branch, sinceDate)) {
RepositoryCommit commitModel = new RepositoryCommit(repositoryName, branch, commit);
- commitModel.setRefs(allRefs.get(commitModel.getName()));
+ List<RefModel> commitRefs = allRefs.get(commitModel.getId());
+ commitModel.setRefs(commitRefs);
commits.add(commitModel);
}
return commits;
@@ -245,7 +246,8 @@
List<RepositoryCommit> commits = new ArrayList<RepositoryCommit>();
for (RevCommit commit : JGitUtils.getRevLog(repository, sinceCommit.getName(), branch)) {
RepositoryCommit commitModel = new RepositoryCommit(repositoryName, branch, commit);
- commitModel.setRefs(allRefs.get(commitModel.getName()));
+ List<RefModel> commitRefs = allRefs.get(commitModel.getId());
+ commitModel.setRefs(commitRefs);
commits.add(commitModel);
}
return commits;
--
Gitblit v1.9.1