commit 3702acee14e1225bbc22e00d5720631b8c47bf45
author Emmanuel Debanne <e.debanne@criteo.com> Fri Sep 12 10:04:15 2014 +0200
committer Emmanuel Debanne <e.debanne@criteo.com> Fri Sep 12 10:04:15 2014 +0200
tree 49ea63f24819fbff2fcdbd55df7da01a02957692
parent f0bbf3202c95f5c44ab6e9ff89b70f0e07e9f9f8

Fix NPE when processing comment

src/main/java/com/criteo/gerrit/plugins/automerge/AutomaticMerger.java

diff --git a/src/main/java/com/criteo/gerrit/plugins/automerge/AutomaticMerger.java b/src/main/java/com/criteo/gerrit/plugins/automerge/AutomaticMerger.java
index 4801546..9bba6cc 100644
--- a/src/main/java/com/criteo/gerrit/plugins/automerge/AutomaticMerger.java
+++ b/src/main/java/com/criteo/gerrit/plugins/automerge/AutomaticMerger.java
@@ -140,10 +140,12 @@
     if (!config.getBotEmail().equals(comment.author.email)) {
       return true;
     }
-    for (ApprovalAttribute approval : comment.approvals) {
-      // See ReviewUpdate#setMinusOne
-      if (!("Code-Review".equals(approval.type) && "-1".equals(approval.value))) {
-        return true;
+    if (comment.approvals != null) {
+      for (ApprovalAttribute approval : comment.approvals) {
+        // See ReviewUpdate#setMinusOne
+        if (!("Code-Review".equals(approval.type) && "-1".equals(approval.value))) {
+          return true;
+        }
       }
     }
     return false;