usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject [27/50] [abbrv] usergrid git commit: Update distinct code.
Date Mon, 02 May 2016 17:54:58 GMT
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/3c21c2c4
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/3c21c2c4
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/3c21c2c4

Branch: refs/heads/USERGRID-1246-MASTER
Commit: 3c21c2c477f57210e2c17e92b78605c29a08eab4
Parents: b059333
Author: Michael Russo <mrusso@apigee.com>
Authored: Wed Apr 20 18:26:48 2016 -0700
Committer: George Reyes <grey@apache.org>
Committed: Mon May 2 10:49:34 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/3c21c2c4/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 -> {


Mime
View raw message