Fixing controller merge logic.
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/32cfc625 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/32cfc625 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/32cfc625 Branch: refs/heads/master Commit: 32cfc625115346501bb64311e9899ebb552a7b29 Parents: 2d12cbf Author: Aaron McCurry <amccu...@gmail.com> Authored: Fri Jan 15 14:20:25 2016 -0500 Committer: Aaron McCurry <amccu...@gmail.com> Committed: Fri Jan 15 14:20:25 2016 -0500 ---------------------------------------------------------------------- .../src/main/java/org/apache/blur/thrift/BlurControllerServer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/32cfc625/blur-core/src/main/java/org/apache/blur/thrift/BlurControllerServer.java ---------------------------------------------------------------------- diff --git a/blur-core/src/main/java/org/apache/blur/thrift/BlurControllerServer.java b/blur-core/src/main/java/org/apache/blur/thrift/BlurControllerServer.java index f43be5b..477c923 100644 --- a/blur-core/src/main/java/org/apache/blur/thrift/BlurControllerServer.java +++ b/blur-core/src/main/java/org/apache/blur/thrift/BlurControllerServer.java @@ -1861,7 +1861,7 @@ public class BlurControllerServer extends TableAdmin implements Iface { } })); } - return new ArrayList<String>().subList(startingAt, fetch); + return new ArrayList<String>(result).subList(startingAt, Math.min(fetch, result.size())); } catch (Exception e) { throw new BException(e.getMessage(), e); }
