Updated Branches: refs/heads/trunk 8edf6a619 -> 71845d214
fix Streaming test Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/71845d21 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/71845d21 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/71845d21 Branch: refs/heads/trunk Commit: 71845d214babc5a1eba9e9fcfccb898853030f9b Parents: 8edf6a6 Author: Yuki Morishita <[email protected]> Authored: Thu Sep 13 12:41:19 2012 -0500 Committer: Yuki Morishita <[email protected]> Committed: Thu Sep 13 12:41:40 2012 -0500 ---------------------------------------------------------------------- .../apache/cassandra/streaming/FileStreamTask.java | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/71845d21/src/java/org/apache/cassandra/streaming/FileStreamTask.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/streaming/FileStreamTask.java b/src/java/org/apache/cassandra/streaming/FileStreamTask.java index 5ecdfbf..f4162de 100644 --- a/src/java/org/apache/cassandra/streaming/FileStreamTask.java +++ b/src/java/org/apache/cassandra/streaming/FileStreamTask.java @@ -192,6 +192,7 @@ public class FileStreamTask extends WrappedRunnable { MessagingService.validateMagic(input.readInt()); String id = input.readUTF(); + input.readInt(); // skip timestamp // since we reject streaming with different version, using current_version here is fine MessageIn message = MessageIn.read(input, MessagingService.current_version, id); assert message.verb == MessagingService.Verb.STREAM_REPLY : "Non-reply message received on stream socket";
