Updated Branches: refs/heads/cassandra-2.0 a462083fc -> 4d36bbfbb
Fix tests Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4d36bbfb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4d36bbfb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4d36bbfb Branch: refs/heads/cassandra-2.0 Commit: 4d36bbfbbb1692ef6038189fdd4981f23431cef0 Parents: a462083 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Fri Dec 20 09:44:38 2013 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Fri Dec 20 09:44:38 2013 +0100 ---------------------------------------------------------------------- .../org/apache/cassandra/service/pager/AbstractQueryPager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d36bbfb/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java b/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java index 6047b5b..ba4d8f2 100644 --- a/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java +++ b/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java @@ -197,7 +197,7 @@ abstract class AbstractQueryPager implements QueryPager } // If there is less live data than to discard, all is discarded - if (i >= rows.size()) + if (toDiscard > 0 && i >= rows.size()) return Collections.<Row>emptyList(); int count = firstCf.getColumnCount(); @@ -234,7 +234,7 @@ abstract class AbstractQueryPager implements QueryPager } // If there is less live data than to discard, all is discarded - if (i < 0) + if (toDiscard > 0 && i < 0) return Collections.<Row>emptyList(); int count = lastCf.getColumnCount();