From 623956b838ad918fbd723c75de8ca9d71c742265 Mon Sep 17 00:00:00 2001
From: Trustin Lee <trustin@gmail.com>
Date: Fri, 28 Sep 2012 15:26:38 +0900
Subject: [PATCH] [#441] Provide a better way to handle decoder failures

* Make HttpChunkAggregator handle DecoderResult properly
---
 .../codec/http/HttpChunkAggregator.java        | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpChunkAggregator.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpChunkAggregator.java
index d9097a0feb..f32963f308 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/HttpChunkAggregator.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/HttpChunkAggregator.java
@@ -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.