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

Make sure to release the buffer when it's written to the next byte buffer

Browse Source 
.. otherwise it will leak.
This commit is contained in:
Trustin Lee 2013-04-04 14:37:54 +09:00
parent 46540578fc
commit 788b88b7af
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
codec/src/main/java/io/netty/handler/codec/OutputMessageBuf.java
View File

@ -16,6 +16,7 @@
package io.netty.handler.codec;
import io.netty.buffer.BufType;
import io.netty.buffer.BufUtil;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.DefaultMessageBuf;
import io.netty.buffer.MessageBuf;
@ -102,7 +103,7 @@ final class OutputMessageBuf extends DefaultMessageBuf<Object> {
if (byteBufCnt == size) {
// Contains only ByteBufs
for (Object o = poll();;) {
nextByteBuf.writeBytes((ByteBuf) o);
writeAndRelease(nextByteBuf, (ByteBuf) o);
if ((o = poll()) == null) {
break;
}
@ -112,7 +113,7 @@ final class OutputMessageBuf extends DefaultMessageBuf<Object> {
final MessageBuf<Object> nextMsgBuf = ctx.nextInboundMessageBuffer();
for (Object o = poll();;) {
if (o instanceof ByteBuf) {
nextByteBuf.writeBytes((ByteBuf) o);
writeAndRelease(nextByteBuf, (ByteBuf) o);
} else {
nextMsgBuf.add(o);
}
@ -141,7 +142,7 @@ final class OutputMessageBuf extends DefaultMessageBuf<Object> {
if (byteBufCnt == size) {
// Contains only ByteBufs
for (Object o = poll();;) {
nextByteBuf.writeBytes((ByteBuf) o);
writeAndRelease(nextByteBuf, (ByteBuf) o);
if ((o = poll()) == null) {
break;
}
@ -151,7 +152,7 @@ final class OutputMessageBuf extends DefaultMessageBuf<Object> {
final MessageBuf<Object> nextMsgBuf = ctx.nextOutboundMessageBuffer();
for (Object o = poll();;) {
if (o instanceof ByteBuf) {
nextByteBuf.writeBytes((ByteBuf) o);
writeAndRelease(nextByteBuf, (ByteBuf) o);
} else {
nextMsgBuf.add(o);
}
@ -164,4 +165,9 @@ final class OutputMessageBuf extends DefaultMessageBuf<Object> {
return true;
}
private static void writeAndRelease(ByteBuf dst, ByteBuf src) {
dst.writeBytes(src, src.readerIndex(), src.readableBytes());
BufUtil.release(src);
}
}