Fixes rebuild bug
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/5889a3b4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/5889a3b4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/5889a3b4 Branch: refs/heads/USERGRID-480 Commit: 5889a3b4d1ae7afe450a76594f3de8f9ba300f8c Parents: c7e3459 Author: Todd Nine <[email protected]> Authored: Thu Mar 19 19:53:55 2015 -0600 Committer: Todd Nine <[email protected]> Committed: Thu Mar 19 19:53:55 2015 -0600 ---------------------------------------------------------------------- .../java/org/apache/usergrid/corepersistence/CpWalker.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5889a3b4/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java index 332d5a8..c14447d 100644 --- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java +++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java @@ -101,10 +101,8 @@ public class CpWalker { edgeType = CpNamingUtils.getEdgeTypeFromCollectionName( collectionName ); } - Observable<String> edgeTypes = gm.getEdgeTypesFromSource( - new SimpleSearchEdgeType( applicationId, edgeType, null ) ); - - edgeTypes.flatMap( emittedEdgeType -> { + Observable<Edge> edges = gm.getEdgeTypesFromSource( + new SimpleSearchEdgeType( applicationId, edgeType, null ) ).flatMap( emittedEdgeType -> { logger.debug( "Loading edges of type {} from node {}", edgeType, applicationId ); @@ -136,6 +134,6 @@ public class CpWalker { }, 100 ); // wait for it to complete - edgeTypes.toBlocking().lastOrDefault( null ); // end foreach on edges + edges.toBlocking().lastOrDefault( null ); // end foreach on edges } }
