You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2015/06/29 19:40:28 UTC
[16/50] [abbrv] incubator-usergrid git commit: fix index
notifications push errors
fix index notifications push errors
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/0c43c1a5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/0c43c1a5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/0c43c1a5
Branch: refs/heads/USERGRID-703
Commit: 0c43c1a52a9127f2c17574a13f3ff0da57213449
Parents: 9324e1c
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Jun 17 09:55:23 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Jun 17 09:55:23 2015 -0600
----------------------------------------------------------------------
.../corepersistence/asyncevents/AmazonAsyncEventService.java | 2 +-
.../java/org/apache/usergrid/services/queues/QueueListener.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0c43c1a5/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AmazonAsyncEventService.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AmazonAsyncEventService.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AmazonAsyncEventService.java
index 9e04b01..0c34a22 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AmazonAsyncEventService.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AmazonAsyncEventService.java
@@ -376,7 +376,7 @@ public class AmazonAsyncEventService implements AsyncEventService {
Timer.Context timer = readTimer.time();
try {
- drainList = take().toList().toBlocking().last();
+ drainList = take().toList().toBlocking().lastOrDefault(null);
//emit our list in it's entity to hand off to a worker pool
subscriber.onNext(drainList);
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0c43c1a5/stack/services/src/main/java/org/apache/usergrid/services/queues/QueueListener.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/queues/QueueListener.java b/stack/services/src/main/java/org/apache/usergrid/services/queues/QueueListener.java
index c85128f..d38db95 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/queues/QueueListener.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/queues/QueueListener.java
@@ -215,7 +215,7 @@ public abstract class QueueListener {
LOG.info("sleep interrupted");
}
}
- }).toBlocking().last();
+ }).toBlocking().lastOrDefault(null);
}
}