From 8bd7ea2f93817339670b3d6eae7499582de7ead2 Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Sun, 10 Feb 2013 00:03:47 +0900 Subject: [PATCH] Fix SnappyFramedEncoderTest & SnappyFramedEncoder - chunkLength is 3 bytes --- .../codec/compression/SnappyFramedEncoder.java | 1 + .../codec/compression/SnappyFramedEncoderTest.java | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/codec/src/main/java/io/netty/handler/codec/compression/SnappyFramedEncoder.java b/codec/src/main/java/io/netty/handler/codec/compression/SnappyFramedEncoder.java index f6f23acd10..cbfe60119c 100644 --- a/codec/src/main/java/io/netty/handler/codec/compression/SnappyFramedEncoder.java +++ b/codec/src/main/java/io/netty/handler/codec/compression/SnappyFramedEncoder.java @@ -102,6 +102,7 @@ public class SnappyFramedEncoder extends ByteToByteEncoder { private static void writeChunkLength(ByteBuf out, int chunkLength) { out.writeByte(chunkLength & 0xff); out.writeByte(chunkLength >>> 8 & 0xff); + out.writeByte(chunkLength >>> 16 & 0xff); } /** diff --git a/codec/src/test/java/io/netty/handler/codec/compression/SnappyFramedEncoderTest.java b/codec/src/test/java/io/netty/handler/codec/compression/SnappyFramedEncoderTest.java index 2083ec97c7..307668bb7c 100644 --- a/codec/src/test/java/io/netty/handler/codec/compression/SnappyFramedEncoderTest.java +++ b/codec/src/test/java/io/netty/handler/codec/compression/SnappyFramedEncoderTest.java @@ -41,8 +41,8 @@ public class SnappyFramedEncoderTest { assertTrue(channel.finish()); ByteBuf expected = Unpooled.wrappedBuffer(new byte[] { - -0x80, 0x06, 0x00, 0x73, 0x4e, 0x61, 0x50, 0x70, 0x59, - 0x01, 0x05, 0x00, 0x2d, -0x5a, -0x7e, -0x5e, 'n', 'e', 't', 't', 'y' + -0x80, 0x06, 0x00, 0x00, 0x73, 0x4e, 0x61, 0x50, 0x70, 0x59, + 0x01, 0x09, 0x00, 0x00, 0x2d, -0x5a, -0x7e, -0x5e, 'n', 'e', 't', 't', 'y' }); assertEquals(expected, channel.readOutbound()); } @@ -58,8 +58,8 @@ public class SnappyFramedEncoderTest { assertTrue(channel.finish()); ByteBuf expected = Unpooled.wrappedBuffer(new byte[] { - -0x80, 0x06, 0x00, 0x73, 0x4e, 0x61, 0x50, 0x70, 0x59, - 0x00, 0x14, 0x00, 0x7b, 0x1f, 0x65, 0x64, + -0x80, 0x06, 0x00, 0x00, 0x73, 0x4e, 0x61, 0x50, 0x70, 0x59, + 0x00, 0x0E, 0x00, 0x00, 0x7b, 0x1f, 0x65, 0x64, 0x14, 0x10, 'n', 'e', 't', 't', 'y', 0x3a, 0x05, 0x00 @@ -79,9 +79,9 @@ public class SnappyFramedEncoderTest { assertTrue(channel.finish()); ByteBuf expected = Unpooled.wrappedBuffer(new byte[] { - -0x80, 0x06, 0x00, 0x73, 0x4e, 0x61, 0x50, 0x70, 0x59, - 0x01, 0x05, 0x00, 0x2d, -0x5a, -0x7e, -0x5e, 'n', 'e', 't', 't', 'y', - 0x01, 0x05, 0x00, 0x2d, -0x5a, -0x7e, -0x5e, 'n', 'e', 't', 't', 'y', + -0x80, 0x06, 0x00, 0x00, 0x73, 0x4e, 0x61, 0x50, 0x70, 0x59, + 0x01, 0x09, 0x00, 0x00, 0x2d, -0x5a, -0x7e, -0x5e, 'n', 'e', 't', 't', 'y', + 0x01, 0x09, 0x00, 0x00, 0x2d, -0x5a, -0x7e, -0x5e, 'n', 'e', 't', 't', 'y', }); assertEquals(expected, channel.readOutbound()); }