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

[#441] Provide a better way to handle decoder failures

Browse Source 
* Make HttpChunkAggregator handle DecoderResult properly
This commit is contained in:
Trustin Lee 2012-09-28 15:26:38 +09:00
parent 9155f58c64
commit 623956b838
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
codec-http/src/main/java/io/netty/handler/codec/http/HttpChunkAggregator.java
View File

@ -22,6 +22,7 @@ import io.netty.buffer.Unpooled;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelPipeline;
import io.netty.handler.codec.DecoderResult;
import io.netty.handler.codec.MessageToMessageDecoder;
import io.netty.handler.codec.TooLongFrameException;
import io.netty.util.CharsetUtil;
@ -124,6 +125,12 @@ public class HttpChunkAggregator extends MessageToMessageDecoder<HttpObject, Htt
ctx.write(CONTINUE.duplicate());
}
if (!m.getDecoderResult().isSuccess()) {
m.setTransferEncoding(HttpTransferEncoding.SINGLE);
this.currentMessage = null;
return m;
}
switch (m.getTransferEncoding()) {
case SINGLE:
this.currentMessage = null;
@ -164,7 +171,16 @@ public class HttpChunkAggregator extends MessageToMessageDecoder<HttpObject, Htt
// Append the content of the chunk
appendToCumulation(chunk.getContent());
if (chunk.isLast()) {
final boolean last;
if (!chunk.getDecoderResult().isSuccess()) {
currentMessage.setDecoderResult(
DecoderResult.partialFailure(chunk.getDecoderResult().cause()));
last = true;
} else {
last = chunk.isLast();
}
if (last) {
this.currentMessage = null;
// Merge trailing headers into the message.