summaryrefslogtreecommitdiffstats
path: root/src/main/java/com/gitblit
diff options
context:
space:
mode:
authorRobin Rosenberg <robin.rosenberg@dewire.com>2013-09-01 19:58:00 +0200
committerRobin Rosenberg <robin.rosenberg@dewire.com>2013-09-01 19:58:00 +0200
commit02ede7f11c6fb28ca53fc240905cd1b140236f08 (patch)
treea796a0b11cfa687d0f66b76f6f1b0b933d375a47 /src/main/java/com/gitblit
parent7fa7ba0590f819aeda3bcb6d6d1003009d77de65 (diff)
downloadgitblit-02ede7f11c6fb28ca53fc240905cd1b140236f08.tar.gz
gitblit-02ede7f11c6fb28ca53fc240905cd1b140236f08.zip
Avoid NPE when the default branch cannot be identified
This is a normal condition that complicates debugging, i.e. when catching all NPE's.
Diffstat (limited to 'src/main/java/com/gitblit')
-rw-r--r--src/main/java/com/gitblit/utils/JGitUtils.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main/java/com/gitblit/utils/JGitUtils.java b/src/main/java/com/gitblit/utils/JGitUtils.java
index 8676d748..3f01eeaf 100644
--- a/src/main/java/com/gitblit/utils/JGitUtils.java
+++ b/src/main/java/com/gitblit/utils/JGitUtils.java
@@ -566,6 +566,8 @@ public class JGitUtils {
try {
if (tree == null) {
ObjectId object = getDefaultBranch(repository);
+ if (object == null)
+ return null;
RevCommit commit = rw.parseCommit(object);
tree = commit.getTree();
}