Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 ef92bb5f3 -> 60faac434 refs/heads/trunk 9224dd5cf -> 07dcc9973
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/cassandra-2.1 Commit: 60faac4340d959f9ce100430c84e1d26f7aa28af Parents: ef92bb5 Author: Joshua McKenzie <[email protected]> Authored: Tue May 6 15:16:27 2014 -0500 Committer: Yuki Morishita <[email protected]> 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++);
