andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[#1943] Unpooled.copiedBuffer(ByteBuf pooled) should always return unpooled ByteBuf

Browse Source
This commit is contained in:
Norman Maurer 2013-10-22 20:20:04 +02:00
parent ceab146b54
commit 4ce49a6195
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
buffer/src/main/java/io/netty/buffer/Unpooled.java
View File

@ -408,8 +408,16 @@ public final class Unpooled {
* respectively. * respectively.
*/ */
public static ByteBuf copiedBuffer(ByteBuf buffer) { public static ByteBuf copiedBuffer(ByteBuf buffer) {
if (buffer.isReadable()) { int readable = buffer.readableBytes();
return buffer.copy(); if (readable > 0) {
ByteBuf copy;
if (buffer.isDirect()) {
copy = directBuffer(readable);
} else {
copy = buffer(readable);
}
copy.writeBytes(buffer, buffer.readerIndex(), readable);
return copy;
} else { } else {
return EMPTY_BUFFER; return EMPTY_BUFFER;
} }