From feae0435b5bc17d6e72a5370947564c891517387 Mon Sep 17 00:00:00 2001 From: Norman Maurer Date: Thu, 24 Nov 2016 14:01:13 +0100 Subject: [PATCH] SwappedByteBuf.unwrap() should return wrapped buffer. Motivation: SwappedByteBuf.unwrap() not returned the wrapped buffer but the buffer that was wrapped by the original buffer. This is not correct. Modifications: Correctly return wrapped buffer and fix test. Result: SwappedByteBuf.unwrap() works as expected. --- buffer/src/main/java/io/netty/buffer/SwappedByteBuf.java | 2 +- .../src/test/java/io/netty/buffer/ByteBufDerivationTest.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/buffer/src/main/java/io/netty/buffer/SwappedByteBuf.java b/buffer/src/main/java/io/netty/buffer/SwappedByteBuf.java index b1f752ed19..5d54a1f9f1 100644 --- a/buffer/src/main/java/io/netty/buffer/SwappedByteBuf.java +++ b/buffer/src/main/java/io/netty/buffer/SwappedByteBuf.java @@ -69,7 +69,7 @@ public class SwappedByteBuf extends ByteBuf { @Override public ByteBuf unwrap() { - return buf.unwrap(); + return buf; } @Override diff --git a/buffer/src/test/java/io/netty/buffer/ByteBufDerivationTest.java b/buffer/src/test/java/io/netty/buffer/ByteBufDerivationTest.java index abf7a1524c..2983ba906f 100644 --- a/buffer/src/test/java/io/netty/buffer/ByteBufDerivationTest.java +++ b/buffer/src/test/java/io/netty/buffer/ByteBufDerivationTest.java @@ -22,6 +22,7 @@ import java.nio.ByteOrder; import java.util.Random; import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.sameInstance; import static org.junit.Assert.*; /** @@ -156,7 +157,7 @@ public class ByteBufDerivationTest { ByteBuf swapped = buf.order(ByteOrder.LITTLE_ENDIAN); assertThat(swapped, instanceOf(SwappedByteBuf.class)); - assertThat(swapped.unwrap(), is((ByteBuf) null)); + assertThat(swapped.unwrap(), sameInstance(buf)); assertThat(swapped.order(ByteOrder.LITTLE_ENDIAN), sameInstance(swapped)); assertThat(swapped.order(ByteOrder.BIG_ENDIAN), sameInstance(buf));