[#2006] Correctly handle HttpMessage / HttpContent implementations

2013-11-26 10:57:24 +01:00 · 2013-11-26 10:57:24 +01:00 · 10e3651bf8
commit 10e3651bf8
parent 98845cb392
1 changed files with 6 additions and 1 deletions
--- a/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentEncoder.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentEncoder.java
@ -149,7 +149,12 @@ public abstract class HttpContentEncoder extends MessageToMessageCodec<HttpReque
                } else {
                    out.add(res);
                    state = State.AWAIT_CONTENT;
-                    break;
+                    if (!(msg instanceof HttpContent)) {
+                        // only break out the switch statement if we have not content to process
+                        // See https://github.com/netty/netty/issues/2006
+                        break;
+                    }
+                    // Fall through to encode the content
                }
            }
            case AWAIT_CONTENT: {