Update distinct code.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/7df40ac4 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/7df40ac4 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/7df40ac4 Branch: refs/heads/master Commit: 7df40ac4122240c0f4c5ac06fd6071726f7cf85f Parents: 938bef0 Author: Michael Russo <mru...@apigee.com> Authored: Wed Apr 20 18:26:48 2016 -0700 Committer: Michael Russo <mru...@apigee.com> Committed: Wed Apr 20 18:26:48 2016 -0700 ---------------------------------------------------------------------- .../services/notifications/impl/ApplicationQueueManagerImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/7df40ac4/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 4b2612f..d50bd81 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 @@ -23,6 +23,7 @@ import org.apache.usergrid.persistence.core.executor.TaskExecutorFactory; import org.apache.usergrid.persistence.core.metrics.MetricsFactory; import org.apache.usergrid.persistence.entities.*; import org.apache.usergrid.persistence.Query; +import org.apache.usergrid.persistence.index.utils.UUIDUtils; import org.apache.usergrid.persistence.queue.QueueManager; import org.apache.usergrid.persistence.queue.QueueMessage; import org.apache.usergrid.services.notifications.*; @@ -316,7 +317,7 @@ public class ApplicationQueueManagerImpl implements ApplicationQueueManager { return queueMessage.get().getNotificationId(); } - return queueMessage; // this will always be distinct, default handling for the Optional.empty() case + return UUIDUtils.newTimeUUID(); // this should be distinct, default handling for the Optional.empty() case } ) .doOnNext( message -> {