test fixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/4116ce5b Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/4116ce5b Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/4116ce5b Branch: refs/heads/USERGRID-641 Commit: 4116ce5b40bfde6d4a37ae366595ad5d3444eb2c Parents: b8a95e9 Author: Shawn Feldman <[email protected]> Authored: Fri May 15 13:25:45 2015 -0600 Committer: Shawn Feldman <[email protected]> Committed: Fri May 15 13:25:45 2015 -0600 ---------------------------------------------------------------------- .../corepersistence/asyncevents/InMemoryAsyncEventService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4116ce5b/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/InMemoryAsyncEventService.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/InMemoryAsyncEventService.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/InMemoryAsyncEventService.java index 6faa695..2620056 100644 --- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/InMemoryAsyncEventService.java +++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/InMemoryAsyncEventService.java @@ -110,7 +110,7 @@ public class InMemoryAsyncEventService implements AsyncEventService { observable.subscribeOn( rxTaskScheduler.getAsyncIOScheduler() ).subscribe(); } else { - observable.toBlocking().last(); + observable.toBlocking().lastOrDefault(null); } } }
