Updated Branches: refs/heads/trunk 447fcef48 -> 88ae22f38
Fix bug in binary protocol Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/88ae22f3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/88ae22f3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/88ae22f3 Branch: refs/heads/trunk Commit: 88ae22f3851fc253e3d02b34d53ea56c7fefe97f Parents: 447fcef Author: Sylvain Lebresne <[email protected]> Authored: Wed Oct 3 12:37:34 2012 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Wed Oct 3 12:37:34 2012 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/transport/Frame.java | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/88ae22f3/src/java/org/apache/cassandra/transport/Frame.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/transport/Frame.java b/src/java/org/apache/cassandra/transport/Frame.java index b164998..8e3240b 100644 --- a/src/java/org/apache/cassandra/transport/Frame.java +++ b/src/java/org/apache/cassandra/transport/Frame.java @@ -156,7 +156,7 @@ public class Frame } @Override - protected Object decode (ChannelHandlerContext ctx, Channel channel, ChannelBuffer buffer) + protected Object decode(ChannelHandlerContext ctx, Channel channel, ChannelBuffer buffer) throws Exception { ChannelBuffer frame = (ChannelBuffer) super.decode(ctx, channel, buffer); @@ -166,13 +166,6 @@ public class Frame } return Frame.create(frame, connection); } - - @Override - protected ChannelBuffer extractFrame(ChannelBuffer buffer, int index, int length) - { - // Don't copy - return buffer.slice(index, length); - } } public static class Encoder extends OneToOneEncoder
