fix paging
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/9636aead Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/9636aead Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/9636aead Branch: refs/heads/USERGRID-641 Commit: 9636aead6549bb308cc491777fcb9eb256169556 Parents: bc3cafb Author: Shawn Feldman <[email protected]> Authored: Tue May 12 12:59:27 2015 -0700 Committer: Shawn Feldman <[email protected]> Committed: Tue May 12 12:59:27 2015 -0700 ---------------------------------------------------------------------- stack/core/src/test/resources/usergrid-custom-test.properties | 2 ++ .../usergrid/management/cassandra/ManagementServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/9636aead/stack/core/src/test/resources/usergrid-custom-test.properties ---------------------------------------------------------------------- diff --git a/stack/core/src/test/resources/usergrid-custom-test.properties b/stack/core/src/test/resources/usergrid-custom-test.properties index a69e01f..a6379e8 100644 --- a/stack/core/src/test/resources/usergrid-custom-test.properties +++ b/stack/core/src/test/resources/usergrid-custom-test.properties @@ -25,4 +25,6 @@ elasticsearch.number_replicas=0 elasticsearch.index_prefix=core_tests elasticsearch.queue_impl.resolution=true +elasticsearch.buffer_timeout=1 + http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/9636aead/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java ---------------------------------------------------------------------- diff --git a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java b/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java index fba3066..c520aac 100644 --- a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java +++ b/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java @@ -1481,7 +1481,7 @@ public class ManagementServiceImpl implements ManagementService { organizations.put( entity.getUuid(), path ); } - results = results.getNextPageResults(); + results = results.hasMoreResults() ? results.getNextPageResults() : null ; }while(results != null); return organizations;
