commit 05b34a04cf2dd4f1c64dd72110a79ab9653947df
author Jorge Ruesga <j.ruesga.criado@gmail.com> Sat May 27 00:44:02 2017 +0200
committer Jorge Ruesga <j.ruesga.criado@gmail.com> Sat May 27 09:54:47 2017 +0000
tree 9e63fd9e3c0aa0a46c6f53a460315c26a4d8328c
parent c7282add1fc349e493137348ba5ea458947a853c

cloud-notifications: fix NPE on assignee removed

Change-Id: Ie14505e8e068142f9bc7d69e027d7101fe9df4db
Signed-off-by: Jorge Ruesga <j.ruesga.criado@gmail.com>
(cherry picked from commit 2eb77d8bbdbfeac285ebecdc8cdeb1a9d595df73)

src/main/java/com/ruesga/gerrit/plugins/fcm/handlers/AssigneeChangedEventHandler.java

diff --git a/src/main/java/com/ruesga/gerrit/plugins/fcm/handlers/AssigneeChangedEventHandler.java b/src/main/java/com/ruesga/gerrit/plugins/fcm/handlers/AssigneeChangedEventHandler.java
index 9ae578e..fa050ea 100644
--- a/src/main/java/com/ruesga/gerrit/plugins/fcm/handlers/AssigneeChangedEventHandler.java
+++ b/src/main/java/com/ruesga/gerrit/plugins/fcm/handlers/AssigneeChangedEventHandler.java
@@ -74,10 +74,15 @@
         assignee._new = event.getChange().assignee;
         Notification notification = createNotification(event);
         notification.extra = getSerializer().toJson(assignee);
-        notification.body = formatAccount(event.getWho())
-                + " change assignee to "
-                + formatAccount(event.getChange().assignee)
-                + " on this change";
+        if (assignee._new == null) {
+            notification.body = formatAccount(event.getWho())
+                    + " unassigned " + formatAccount(assignee.old)
+                    + " from this change";
+        } else {
+            notification.body = formatAccount(event.getWho())
+                    + " assigned " + formatAccount(assignee._new)
+                    + " to this change";
+        }
 
         notify(notification, event);
     }