From c658df9e87d65b08d5482cf04489cb0532ff83dd Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 13 Oct 2012 10:50:35 -0400
Subject: [PATCH] Merge branch 'master' of https://github.com/Mrbytes/gitblit
---
src/com/gitblit/models/RefModel.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/com/gitblit/models/RefModel.java b/src/com/gitblit/models/RefModel.java
index fab5fc1..8489c81 100644
--- a/src/com/gitblit/models/RefModel.java
+++ b/src/com/gitblit/models/RefModel.java
@@ -49,7 +49,10 @@
Date date = new Date(0);
if (referencedObject != null) {
if (referencedObject instanceof RevTag) {
- date = ((RevTag) referencedObject).getTaggerIdent().getWhen();
+ RevTag tag = (RevTag) referencedObject;
+ if (tag.getTaggerIdent() != null) {
+ date = tag.getTaggerIdent().getWhen();
+ }
} else if (referencedObject instanceof RevCommit) {
date = ((RevCommit) referencedObject).getCommitterIdent().getWhen();
}
@@ -58,6 +61,9 @@
}
public String getName() {
+ if (reference == null) {
+ return displayName;
+ }
return reference.getName();
}
--
Gitblit v1.9.1