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 8552511E35 for ; Tue, 6 May 2014 21:31:35 +0000 (UTC) Received: (qmail 17379 invoked by uid 500); 6 May 2014 20:25:37 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 16005 invoked by uid 500); 6 May 2014 20:23:03 -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 12587 invoked by uid 99); 6 May 2014 20:18:12 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 May 2014 20:18:12 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5E57E8B435C; Tue, 6 May 2014 20:18:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yukim@apache.org To: commits@cassandra.apache.org Date: Tue, 06 May 2014 20:18:13 -0000 Message-Id: In-Reply-To: <6954530b579b43e4b22a43d045c360b5@git.apache.org> References: <6954530b579b43e4b22a43d045c360b5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] git commit: Fix NPE when stream requestRanges Fix NPE when stream requestRanges Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/60faac43 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/60faac43 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/60faac43 Branch: refs/heads/trunk Commit: 60faac4340d959f9ce100430c84e1d26f7aa28af Parents: ef92bb5 Author: Joshua McKenzie Authored: Tue May 6 15:16:27 2014 -0500 Committer: Yuki Morishita Committed: Tue May 6 15:16:27 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/streaming/StreamCoordinator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/60faac43/src/java/org/apache/cassandra/streaming/StreamCoordinator.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/streaming/StreamCoordinator.java b/src/java/org/apache/cassandra/streaming/StreamCoordinator.java index 425b5b1..ed94f89 100644 --- a/src/java/org/apache/cassandra/streaming/StreamCoordinator.java +++ b/src/java/org/apache/cassandra/streaming/StreamCoordinator.java @@ -223,7 +223,7 @@ public class StreamCoordinator // get else { - if (lastReturned == streamSessions.size() - 1) + if (lastReturned >= streamSessions.size() - 1) lastReturned = 0; return streamSessions.get(lastReturned++);