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

Make sure AggregatedFullHttpMessage.trailingHeaders() return non-null

Browse Source 
When handling an oversized message, HttpObjectAggregator does not wait
until the last chunk is received to produce the failed message, making
AggregatedFullHttpMessage.trailingHeaders() return null.
This commit is contained in:
Trustin Lee 2014-12-31 19:24:53 +09:00
parent dc3bec4a25
commit 24c6b599c4
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
codec-http/src/main/java/io/netty/handler/codec/http/HttpObjectAggregator.java
View File

@ -192,17 +192,23 @@ public class HttpObjectAggregator
protected final HttpMessage message; protected final HttpMessage message;
private HttpHeaders trailingHeaders; private HttpHeaders trailingHeaders;
private AggregatedFullHttpMessage(HttpMessage message, ByteBuf content, HttpHeaders trailingHeaders) { AggregatedFullHttpMessage(HttpMessage message, ByteBuf content, HttpHeaders trailingHeaders) {
super(content); super(content);
this.message = message; this.message = message;
this.trailingHeaders = trailingHeaders; this.trailingHeaders = trailingHeaders;
} }
@Override @Override
public HttpHeaders trailingHeaders() { public HttpHeaders trailingHeaders() {
HttpHeaders trailingHeaders = this.trailingHeaders;
if (trailingHeaders == null) {
return HttpHeaders.EMPTY_HEADERS;
} else {
return trailingHeaders; return trailingHeaders;
} }
}
public void setTrailingHeaders(HttpHeaders trailingHeaders) { void setTrailingHeaders(HttpHeaders trailingHeaders) {
this.trailingHeaders = trailingHeaders; this.trailingHeaders = trailingHeaders;
} }
@ -265,7 +271,7 @@ public class HttpObjectAggregator
private static final class AggregatedFullHttpRequest extends AggregatedFullHttpMessage implements FullHttpRequest { private static final class AggregatedFullHttpRequest extends AggregatedFullHttpMessage implements FullHttpRequest {
private AggregatedFullHttpRequest(HttpRequest request, ByteBuf content, HttpHeaders trailingHeaders) { AggregatedFullHttpRequest(HttpRequest request, ByteBuf content, HttpHeaders trailingHeaders) {
super(request, content, trailingHeaders); super(request, content, trailingHeaders);
} }
@ -373,7 +379,8 @@ public class HttpObjectAggregator
private static final class AggregatedFullHttpResponse extends AggregatedFullHttpMessage private static final class AggregatedFullHttpResponse extends AggregatedFullHttpMessage
implements FullHttpResponse { implements FullHttpResponse {
private AggregatedFullHttpResponse(HttpResponse message, ByteBuf content, HttpHeaders trailingHeaders) {
AggregatedFullHttpResponse(HttpResponse message, ByteBuf content, HttpHeaders trailingHeaders) {
super(message, content, trailingHeaders); super(message, content, trailingHeaders);
} }