Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6D96C18570 for ; Tue, 16 Jun 2015 14:31:11 +0000 (UTC) Received: (qmail 50269 invoked by uid 500); 16 Jun 2015 14:31:11 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 50169 invoked by uid 500); 16 Jun 2015 14:31:11 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 50133 invoked by uid 99); 16 Jun 2015 14:31:11 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Jun 2015 14:31:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id ED25BE3C3A; Tue, 16 Jun 2015 14:31:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: samt@apache.org To: commits@cassandra.apache.org Date: Tue, 16 Jun 2015 14:31:11 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [02/10] cassandra git commit: Unset HAS_MORE_PAGES flag if PagingState is null Unset HAS_MORE_PAGES flag if PagingState is null patch by Berenguer Blasi and Sam Tunnicliffe; reviewed by Aleksey Yeschenko for CASSANDRA-7787 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/80d46b8a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/80d46b8a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/80d46b8a Branch: refs/heads/cassandra-2.1 Commit: 80d46b8acc417978fd8c43862c3352a6381fbf2e Parents: 9e60611 Author: Berenguer Blasi Authored: Tue Jun 9 18:21:14 2015 +0100 Committer: Sam Tunnicliffe Committed: Tue Jun 16 15:16:28 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/ResultSet.java | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/80d46b8a/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index f2693a4..7f507c2 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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/80d46b8a/src/java/org/apache/cassandra/cql3/ResultSet.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/ResultSet.java b/src/java/org/apache/cassandra/cql3/ResultSet.java index 4cda0cd..659ed50 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; }