From 60c3e51aaa0f3355a4d71bd04603f07d2507d316 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 24 Aug 2012 13:07:56 -0400
Subject: [PATCH] Merge branch 'master' of https://github.com/gitblit/gitblit

---
 src/com/gitblit/client/NameRenderer.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/gitblit/client/NameRenderer.java b/src/com/gitblit/client/NameRenderer.java
index 8ba2e00..4cbb590 100644
--- a/src/com/gitblit/client/NameRenderer.java
+++ b/src/com/gitblit/client/NameRenderer.java
@@ -59,14 +59,14 @@
 	public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected,
 			boolean hasFocus, int row, int column) {
 		super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
-		setValue(value, isSelected);
+		setValue(value == null ? "" : value, isSelected);
 		return this;
 	}
 
 	@Override
 	public Component getListCellRendererComponent(JList list, Object value, int index,
 			boolean isSelected, boolean cellHasFocus) {
-		setValue(value, isSelected);
+		setValue(value == null ? "" : value, isSelected);
 		if (isSelected) {
 			setBackground(list.getSelectionBackground());
 			setForeground(list.getSelectionForeground());

--
Gitblit v1.9.1