[netty#1595] Fix IllegalStateException thrown by HttpObjectEncoder wh…

…en an empty HttpContent was written
stephenyik · Jul 17, 2013 · 66c4c07 · 66c4c07
1 parent b9bae2b
commit 66c4c07
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpObjectEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpObjectEncoder.java
@@ -16,6 +16,7 @@
 package io.netty.handler.codec.http;
 
 import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToMessageEncoder;
 import io.netty.util.CharsetUtil;
@@ -81,6 +82,10 @@ protected void encode(ChannelHandlerContext ctx, HttpObject msg, List<Object> ou
             if (state == ST_CONTENT_NON_CHUNK) {
                 if (contentLength > 0) {
                     out.add(content.retain());
+                } else {
+                    // Need to produce some output otherwise an
+                    // IllegalstateException will be thrown
+                    out.add(Unpooled.EMPTY_BUFFER);
                 }
 
                 if (chunk instanceof LastHttpContent) {
@@ -110,6 +115,12 @@ protected void encode(ChannelHandlerContext ctx, HttpObject msg, List<Object> ou
                     }
 
                     state = ST_INIT;
+                } else {
+                  if (contentLength == 0) {
+                      // Need to produce some output otherwise an
+                      // IllegalstateException will be thrown
+                      out.add(Unpooled.EMPTY_BUFFER);
+                  }
                 }
             } else {
                 throw new Error();