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

Fix merge error from f45d754

Browse Source 
Motiviation:
Commit f45d754 from 4.1 was directly merged but interfaces were not updated.

Modifications:
- Fix areas where interfaces have changed between 4.1 and master

Result:
No more compile error.
This commit is contained in:
Scott Mitchell 2015-05-18 14:23:56 -07:00
parent f45d75478f
commit 04a9b834e4
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example/src/main/java/io/netty/example/http2/tiles/FallbackRequestHandler.java
View File

@ -46,7 +46,7 @@ public final class FallbackRequestHandler extends SimpleChannelInboundHandler<Ht
+ ")</h2></body></html>", UTF_8))); + ")</h2></body></html>", UTF_8)));
@Override @Override
protected void channelRead0(ChannelHandlerContext ctx, HttpRequest req) throws Exception { protected void messageReceived(ChannelHandlerContext ctx, HttpRequest req) throws Exception {
if (HttpHeaderUtil.is100ContinueExpected(req)) { if (HttpHeaderUtil.is100ContinueExpected(req)) {
ctx.write(new DefaultFullHttpResponse(HTTP_1_1, CONTINUE)); ctx.write(new DefaultFullHttpResponse(HTTP_1_1, CONTINUE));
} }

4
example/src/main/java/io/netty/example/http2/tiles/Http1RequestHandler.java
View File

@ -36,11 +36,11 @@ import java.util.concurrent.TimeUnit;
public final class Http1RequestHandler extends Http2RequestHandler { public final class Http1RequestHandler extends Http2RequestHandler {
@Override @Override
protected void channelRead0(ChannelHandlerContext ctx, FullHttpRequest request) throws Exception { protected void messageReceived(ChannelHandlerContext ctx, FullHttpRequest request) throws Exception {
if (HttpHeaderUtil.is100ContinueExpected(request)) { if (HttpHeaderUtil.is100ContinueExpected(request)) {
ctx.write(new DefaultFullHttpResponse(HTTP_1_1, CONTINUE)); ctx.write(new DefaultFullHttpResponse(HTTP_1_1, CONTINUE));
} }
super.channelRead0(ctx, request); super.messageReceived(ctx, request);
} }
@Override @Override

4
example/src/main/java/io/netty/example/http2/tiles/Http2RequestHandler.java
View File

@ -52,7 +52,7 @@ public class Http2RequestHandler extends SimpleChannelInboundHandler<FullHttpReq
private static final String IMAGE_COORDINATE_X = "x"; private static final String IMAGE_COORDINATE_X = "x";
@Override @Override
protected void channelRead0(ChannelHandlerContext ctx, FullHttpRequest request) throws Exception { protected void messageReceived(ChannelHandlerContext ctx, FullHttpRequest request) throws Exception {
QueryStringDecoder queryString = new QueryStringDecoder(request.uri()); QueryStringDecoder queryString = new QueryStringDecoder(request.uri());
String streamId = streamId(request); String streamId = streamId(request);
int latency = toInt(firstValue(queryString, LATENCY_FIELD_NAME), 0); int latency = toInt(firstValue(queryString, LATENCY_FIELD_NAME), 0);
@ -107,7 +107,7 @@ public class Http2RequestHandler extends SimpleChannelInboundHandler<FullHttpReq
} }
private String streamId(FullHttpRequest request) { private String streamId(FullHttpRequest request) {
return request.headers().get(HttpUtil.ExtensionHeaderNames.STREAM_ID.text()); return request.headers().getAndConvert(HttpUtil.ExtensionHeaderNames.STREAM_ID.text());
} }
private void streamId(FullHttpResponse response, String streamId) { private void streamId(FullHttpResponse response, String streamId) {