From d9d4677aa4f4774dddd57a6a9aef28931c8f3f5e Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 03 Jul 2013 10:49:31 -0400
Subject: [PATCH] Fix NPE when viewing a federation proposal (issue 195)
---
src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.java | 2 +-
releases.moxie | 1 +
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/releases.moxie b/releases.moxie
index 8567979..78bc340 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -11,6 +11,7 @@
- Use bash instead of sh in Linux/OSX shell scripts (issue 154)
- Fix NPE when getting user's fork without repository list caching (issue 182)
- Fix internal error on folder history links (issue 192)
+ - Fix NPE in repositories panel when viewing a federation proposal (issue 195)
- Fix NPEs when initializing the context on a servlet containers which returns a null contextFolder (issue 199)
- Fixed incorrect icon file name for .doc files (issue 200)
- Do not queue emails with no recipients (issue 201)
diff --git a/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.java b/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.java
index 726af61..e0f9393 100644
--- a/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.java
@@ -132,7 +132,7 @@
for (String root : roots) {
List<RepositoryModel> subModels = groups.get(root);
ProjectModel project = GitBlit.self().getProjectModel(root);
- GroupRepositoryModel group = new GroupRepositoryModel(project.name, subModels.size());
+ GroupRepositoryModel group = new GroupRepositoryModel(project == null ? root : project.name, subModels.size());
if (project != null) {
group.title = project.title;
group.description = project.description;
--
Gitblit v1.9.1