usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [30/39] usergrid git commit: return consistent observable
Date Wed, 14 Oct 2015 16:54:26 GMT
return consistent observable


Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/c19adb80
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/c19adb80
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/c19adb80

Branch: refs/heads/usergrid-1007-shiro-cache
Commit: c19adb809712eafd3ca4a5b28c109cd050f678e2
Parents: 456f80d
Author: Shawn Feldman <sfeldman@apache.org>
Authored: Mon Sep 28 17:06:46 2015 -0600
Committer: Shawn Feldman <sfeldman@apache.org>
Committed: Mon Sep 28 17:06:46 2015 -0600

----------------------------------------------------------------------
 .../corepersistence/asyncevents/AmazonAsyncEventService.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/c19adb80/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 50b210e..d1670ed 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
@@ -239,7 +239,7 @@ public class AmazonAsyncEventService implements AsyncEventService {
 
             if (event == null) {
                 logger.error("AsyncEvent type or event is null!");
-                return Observable.empty();
+                return Observable.just(new IndexEventResult(message, Optional.<IndexOperationMessage>absent(),
false));
             }
             try {
                 //merge each operation to a master observable;


Mime
View raw message