From 80d46b8acc417978fd8c43862c3352a6381fbf2e Mon Sep 17 00:00:00 2001 From: Berenguer Blasi Date: Tue, 9 Jun 2015 18:21:14 +0100 Subject: [PATCH] Unset HAS_MORE_PAGES flag if PagingState is null patch by Berenguer Blasi and Sam Tunnicliffe; reviewed by Aleksey Yeschenko for CASSANDRA-7787 --- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/ResultSet.java | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index f2693a4bb7..7f507c2cfe 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.0.16: + * Set HAS_MORE_PAGES flag to false when PagingState is null (CASSANDRA-9571) * Backport indexed value validation fix from CASSANDRA-9057 (CASSANDRA-9564) * Don't accumulate more range than necessary in RangeTombstone.Tracker (CASSANDRA-9486) * Add broadcast and rpc addresses to system.local (CASSANDRA-9436) diff --git a/src/java/org/apache/cassandra/cql3/ResultSet.java b/src/java/org/apache/cassandra/cql3/ResultSet.java index 4cda0cdc73..659ed50b21 100644 --- a/src/java/org/apache/cassandra/cql3/ResultSet.java +++ b/src/java/org/apache/cassandra/cql3/ResultSet.java @@ -283,11 +283,11 @@ public class ResultSet public Metadata setHasMorePages(PagingState pagingState) { - if (pagingState == null) - return this; - - flags.add(Flag.HAS_MORE_PAGES); this.pagingState = pagingState; + if (pagingState == null) + flags.remove(Flag.HAS_MORE_PAGES); + else + flags.add(Flag.HAS_MORE_PAGES); return this; }