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

Maintain decoder result in HttpObjectAggregator

Browse Source 
Motivation:
DecodeResult is dropped when aggregate HTTP messages.

Modification:

Make sure we not drop the DecodeResult while aggregate HTTP messages.

Result:

Correctly include the DecodeResult for later processing.
This commit is contained in:
Jay 2014-06-28 00:27:21 -04:00 committed by Norman Maurer
parent 79195da0d7
commit 461d3c876f
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,7 +123,7 @@ public class HttpObjectAggregator
HttpRequest req = (HttpRequest) start; HttpRequest req = (HttpRequest) start;
ret = new DefaultFullHttpRequest(req.protocolVersion(), ret = new DefaultFullHttpRequest(req.protocolVersion(),
req.method(), req.uri(), content); req.method(), req.uri(), content);
} else if (start instanceof HttpResponse) { } else if (start instanceof HttpResponse) {
HttpResponse res = (HttpResponse) start; HttpResponse res = (HttpResponse) start;
ret = new DefaultFullHttpResponse( ret = new DefaultFullHttpResponse(
res.protocolVersion(), res.status(), content); res.protocolVersion(), res.status(), content);
@ -132,6 +132,7 @@ public class HttpObjectAggregator
} }
ret.headers().set(start.headers()); ret.headers().set(start.headers());
ret.setDecoderResult(start.decoderResult());
return ret; return ret;
} }

8
codec-http/src/test/java/io/netty/handler/codec/http/HttpObjectAggregatorTest.java
View File

@ -306,7 +306,9 @@ public class HttpObjectAggregatorTest {
public void testBadRequest() { public void testBadRequest() {
EmbeddedChannel ch = new EmbeddedChannel(new HttpRequestDecoder(), new HttpObjectAggregator(1024 * 1024)); EmbeddedChannel ch = new EmbeddedChannel(new HttpRequestDecoder(), new HttpObjectAggregator(1024 * 1024));
ch.writeInbound(Unpooled.copiedBuffer("GET / HTTP/1.0 with extra\r\n", CharsetUtil.UTF_8)); ch.writeInbound(Unpooled.copiedBuffer("GET / HTTP/1.0 with extra\r\n", CharsetUtil.UTF_8));
assertThat(ch.readInbound(), is(instanceOf(FullHttpRequest.class))); Object inbound = ch.readInbound();
assertThat(inbound, is(instanceOf(FullHttpRequest.class)));
assertTrue(((FullHttpRequest) inbound).getDecoderResult().isFailure());
assertNull(ch.readInbound()); assertNull(ch.readInbound());
ch.finish(); ch.finish();
} }
@ -315,7 +317,9 @@ public class HttpObjectAggregatorTest {
public void testBadResponse() throws Exception { public void testBadResponse() throws Exception {
EmbeddedChannel ch = new EmbeddedChannel(new HttpResponseDecoder(), new HttpObjectAggregator(1024 * 1024)); EmbeddedChannel ch = new EmbeddedChannel(new HttpResponseDecoder(), new HttpObjectAggregator(1024 * 1024));
ch.writeInbound(Unpooled.copiedBuffer("HTTP/1.0 BAD_CODE Bad Server\r\n", CharsetUtil.UTF_8)); ch.writeInbound(Unpooled.copiedBuffer("HTTP/1.0 BAD_CODE Bad Server\r\n", CharsetUtil.UTF_8));
assertThat(ch.readInbound(), is(instanceOf(FullHttpResponse.class))); Object inbound = ch.readInbound();
assertThat(inbound, is(instanceOf(FullHttpResponse.class)));
assertTrue(((FullHttpResponse) inbound).getDecoderResult().isFailure());
assertNull(ch.readInbound()); assertNull(ch.readInbound());
ch.finish(); ch.finish();
} }