commit 21c80b1e308c9f88edac3b0de6783e1a54afa8c5
author Patrick Hiesel <hiesel@google.com> Sun Dec 18 19:05:40 2016 +0100
committer Patrick Hiesel <hiesel@google.com> Sun Dec 18 19:05:40 2016 +0100
tree e571f4415b8031f2c1b5adf23d9e337d395fd7a0
parent ea2e68bdd468f8af0f825a435430dae0eae804de

Fix NPE in CommentJson.toFixSuggestionInfos

Change-Id: I4edfcf7cd9578a3e6584d08ab438a4d0d127b688

gerrit-server/src/main/java/com/google/gerrit/server/change/CommentJson.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/CommentJson.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/CommentJson.java
index 65c3424..cd5195f7c 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/CommentJson.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/CommentJson.java
@@ -18,6 +18,7 @@
 
 import com.google.common.base.Strings;
 import com.google.common.collect.FluentIterable;
+import com.google.gerrit.common.Nullable;
 import com.google.gerrit.extensions.client.Comment.Range;
 import com.google.gerrit.extensions.client.Side;
 import com.google.gerrit.extensions.common.CommentInfo;
@@ -193,8 +194,8 @@
     }
 
     private List<FixSuggestionInfo> toFixSuggestionInfos(
-        List<FixSuggestion> fixSuggestions) {
-      if (fixSuggestions.isEmpty()) {
+        @Nullable List<FixSuggestion> fixSuggestions) {
+      if (fixSuggestions == null || fixSuggestions.isEmpty()) {
         return null;
       }