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/e76e65db Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/e76e65db Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/e76e65db Branch: refs/heads/master Commit: e76e65db9d1e106e4bcf3cc7f7a40606308b92e6 Parents: 7df40ac Author: Michael Russo <mru...@apigee.com> Authored: Wed Apr 20 18:52:07 2016 -0700 Committer: Michael Russo <mru...@apigee.com> Committed: Wed Apr 20 18:52:07 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/e76e65db/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
