You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2014/09/18 19:43:07 UTC
git commit: remove notifications query term if we see it. not sure
this is the best fix
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o 29adda4bb -> ddf60e98c
remove notifications query term if we see it. not sure this is the best fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/ddf60e98
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/ddf60e98
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/ddf60e98
Branch: refs/heads/two-dot-o
Commit: ddf60e98ce9380ea0066946f313b8c03ce20df35
Parents: 29adda4
Author: Shawn Feldman <sf...@apache.org>
Authored: Thu Sep 18 11:37:48 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Thu Sep 18 11:37:48 2014 -0600
----------------------------------------------------------------------
.../usergrid/services/notifications/NotificationsService.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ddf60e98/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationsService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationsService.java b/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationsService.java
index ea062c3..bcdfef9 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationsService.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationsService.java
@@ -178,7 +178,9 @@ public class NotificationsService extends AbstractCollectionService {
org.apache.usergrid.persistence.index.query.Query query = sp.getQuery();
if (query == null) {
query = new Query();
- query.addIdentifier(sp.getIdentifier());
+ if(sp.isName() && !sp.getName().equals("notifications")) {
+ query.addIdentifier(sp.getIdentifier());
+ }
}
query.setLimit(PAGE);
query.setCollection(collection);