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

[#971] Fix a bug where the HttpContentCompressor was try to start compressing on an empty response

Browse Source
This commit is contained in:
Norman Maurer 2013-01-30 20:58:07 +01:00
parent 641db5cdfe
commit 97ea338bce
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
codec-http/src/main/java/io/netty/handler/codec/http/HttpContentEncoder.java
View File

@ -83,6 +83,19 @@ public abstract class HttpContentEncoder extends MessageToMessageCodec<HttpMessa
// 100-continue response must be passed through. // 100-continue response must be passed through.
return msg; return msg;
} }
// handle the case of single complete message without content
if (msg instanceof FullHttpMessage && !((FullHttpMessage) msg).data().readable()) {
// Remove content encoding
String acceptEncoding = acceptEncodingQueue.poll();
if (acceptEncoding == null) {
throw new IllegalStateException("cannot send more responses than requests");
}
return msg;
}
if (msg instanceof HttpMessage) { if (msg instanceof HttpMessage) {
assert message == null; assert message == null;
@ -121,6 +134,7 @@ public abstract class HttpContentEncoder extends MessageToMessageCodec<HttpMessa
if (acceptEncoding == null) { if (acceptEncoding == null) {
throw new IllegalStateException("cannot send more responses than requests"); throw new IllegalStateException("cannot send more responses than requests");
} }
Result result = beginEncode(message, c, acceptEncoding); Result result = beginEncode(message, c, acceptEncoding);
if (result == null) { if (result == null) {