Merged #40 "Fix intermittent NPE in getting commit date in RefModel"

releases.moxie

@@ -11,6 +11,7 @@ r22: {
     security: ~
     fixes:
     - Repository mailing lists could not be reset from the Edit Repository page (issue-399)
+    - Fix intermittent NPE in determining commit date in RefModel (issue-401)
     - Fix closing ticket on push by parsing commit messages for closes|fixes (issue-404)
     - Ensure the Lucene ticket index is updated on repository deletion.
     changes:

src/main/java/com/gitblit/models/RefModel.java

@@ -25,6 +25,8 @@ import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.revwalk.RevObject;
 import org.eclipse.jgit.revwalk.RevTag;
 
+import com.gitblit.utils.JGitUtils;
+
 /**
  * RefModel is a serializable model class that represents a tag or branch and
  * includes the referenced object.
@@ -50,11 +52,18 @@ public class RefModel implements Serializable, Comparable<RefModel> {
 		if (referencedObject != null) {
 			if (referencedObject instanceof RevTag) {
 				RevTag tag = (RevTag) referencedObject;
-				if (tag.getTaggerIdent() != null) {
-					date = tag.getTaggerIdent().getWhen();
+				PersonIdent tagger = tag.getTaggerIdent();
+				if (tagger != null) {
+					date = tagger.getWhen();
 				}
 			} else if (referencedObject instanceof RevCommit) {
-				date = ((RevCommit) referencedObject).getCommitterIdent().getWhen();
+				RevCommit commit = (RevCommit) referencedObject;
+				PersonIdent committer = commit.getCommitterIdent();
+				if (committer != null) {
+					date = committer.getWhen();
+				} else {
+					date = JGitUtils.getCommitDate(commit);
+				}
 			}
 		}
 		return date;