Update distinct to properly use device ID.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/d1423d88 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/d1423d88 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/d1423d88 Branch: refs/heads/USERGRID-1246-MASTER Commit: d1423d888b738a6bf20ef99d32c2b8a2223917bd Parents: 3c21c2c Author: Michael Russo <mru...@apigee.com> Authored: Wed Apr 20 18:52:07 2016 -0700 Committer: George Reyes <g...@apache.org> Committed: Mon May 2 10:49:34 2016 -0700 ---------------------------------------------------------------------- .../services/notifications/impl/ApplicationQueueManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/d1423d88/stack/services/src/main/java/org/apache/usergrid/services/notifications/impl/ApplicationQueueManagerImpl.java ---------------------------------------------------------------------- diff --git a/stack/services/src/main/java/org/apache/usergrid/services/notifications/impl/ApplicationQueueManagerImpl.java b/stack/services/src/main/java/org/apache/usergrid/services/notifications/impl/ApplicationQueueManagerImpl.java index d50bd81..fa8c8a2 100644 --- a/stack/services/src/main/java/org/apache/usergrid/services/notifications/impl/ApplicationQueueManagerImpl.java +++ b/stack/services/src/main/java/org/apache/usergrid/services/notifications/impl/ApplicationQueueManagerImpl.java @@ -314,7 +314,7 @@ public class ApplicationQueueManagerImpl implements ApplicationQueueManager { .distinct( queueMessage -> { if(queueMessage.isPresent()) { - return queueMessage.get().getNotificationId(); + return queueMessage.get().getDeviceId(); } return UUIDUtils.newTimeUUID(); // this should be distinct, default handling for the Optional.empty() case
