From ea1dca8105a4542bfe3f2c669c8bc14c4e3518a5 Mon Sep 17 00:00:00 2001 From: Norman Maurer Date: Tue, 6 Aug 2013 12:22:22 +0200 Subject: [PATCH] [#1704] Make sure SwappedByteBuf.readSlice(..) returns ByteBuf with correct ByteOrder --- buffer/src/main/java/io/netty/buffer/SwappedByteBuf.java | 2 +- buffer/src/test/java/io/netty/buffer/AbstractByteBufTest.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/buffer/src/main/java/io/netty/buffer/SwappedByteBuf.java b/buffer/src/main/java/io/netty/buffer/SwappedByteBuf.java index 9e1627abbd..c720f44f9d 100644 --- a/buffer/src/main/java/io/netty/buffer/SwappedByteBuf.java +++ b/buffer/src/main/java/io/netty/buffer/SwappedByteBuf.java @@ -497,7 +497,7 @@ public final class SwappedByteBuf extends ByteBuf { @Override public ByteBuf readSlice(int length) { - return buf.readSlice(length); + return buf.readSlice(length).order(order); } @Override diff --git a/buffer/src/test/java/io/netty/buffer/AbstractByteBufTest.java b/buffer/src/test/java/io/netty/buffer/AbstractByteBufTest.java index ab5c5032b1..eac92e9fae 100644 --- a/buffer/src/test/java/io/netty/buffer/AbstractByteBufTest.java +++ b/buffer/src/test/java/io/netty/buffer/AbstractByteBufTest.java @@ -1254,6 +1254,7 @@ public abstract class AbstractByteBufTest { assertEquals(i, buffer.readerIndex()); assertEquals(CAPACITY, buffer.writerIndex()); ByteBuf actualValue = buffer.readSlice(BLOCK_SIZE); + assertEquals(buffer.order(), actualValue.order()); assertEquals(wrappedBuffer(expectedValue), actualValue); // Make sure if it is a sliced buffer.