Don't NPE generating CommitJsonData for merges
There is still more work to do to handle merges, but an empty list is
better than an error.
Change-Id: I3efe7fe17f34f6d7f0ba7dcb074ae7374a022361
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/CommitJsonData.java b/gitiles-servlet/src/main/java/com/google/gitiles/CommitJsonData.java
index 01f5ed0..99e7980 100644
--- a/gitiles-servlet/src/main/java/com/google/gitiles/CommitJsonData.java
+++ b/gitiles-servlet/src/main/java/com/google/gitiles/CommitJsonData.java
@@ -14,6 +14,7 @@
package com.google.gitiles;
+import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
@@ -116,6 +117,9 @@
}
private static List<Diff> toJsonData(DiffList dl) {
+ if (dl.entries == null) {
+ return ImmutableList.of();
+ }
List<Diff> result = Lists.newArrayListWithCapacity(dl.entries.size());
for (DiffEntry de : dl.entries) {
Diff d = new Diff();
