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

[#1222] Correctly handle the case when a MessageToMessageEncoder encodes to ByteBuf and the next outbound buffer is of type ByteBuf

Browse Source
This commit is contained in:
Norman Maurer 2013-04-02 07:17:10 +02:00
parent 96bf71e814
commit a0fca93128
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
codec/src/main/java/io/netty/handler/codec/MessageToMessageEncoder.java
View File

@ -17,6 +17,7 @@ package io.netty.handler.codec;
import io.netty.buffer.MessageBuf; import io.netty.buffer.MessageBuf;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelHandlerUtil;
import io.netty.channel.ChannelOutboundMessageHandlerAdapter; import io.netty.channel.ChannelOutboundMessageHandlerAdapter;
/** /**
@ -51,7 +52,11 @@ public abstract class MessageToMessageEncoder<I> extends ChannelOutboundMessageH
@Override @Override
public final void flush(ChannelHandlerContext ctx, I msg) throws Exception { public final void flush(ChannelHandlerContext ctx, I msg) throws Exception {
try { try {
ctx.nextOutboundMessageBuffer().unfoldAndAdd(encode(ctx, msg)); Object encoded = encode(ctx, msg);
// Handle special case when the encoded output is a ByteBuf and the next handler in the pipeline
// accept bytes. Related to #1222
ChannelHandlerUtil.addToNextOutboundBuffer(ctx, encoded);
} catch (CodecException e) { } catch (CodecException e) {
throw e; throw e;
} catch (Exception e) { } catch (Exception e) {