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

Fixing broken build in the 4.1 branch.

Browse Source
This commit is contained in:
nmittler 2015-06-19 16:08:37 -07:00
parent 05ce33f5ca
commit 391df0547b
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
codec-http2/src/main/java/io/netty/handler/codec/http2/Http2ConnectionHandler.java
View File

@ -172,7 +172,7 @@ public class Http2ConnectionHandler extends ByteToMessageDecoder implements Http
// Trigger pending writes in the remote flow controller. // Trigger pending writes in the remote flow controller.
connection().remote().flowController().writePendingBytes(); connection().remote().flowController().writePendingBytes();
try { try {
super.flush(ctx); ctx.flush();
} catch (Throwable t) { } catch (Throwable t) {
throw new Http2Exception(INTERNAL_ERROR, "Error flushing" , t); throw new Http2Exception(INTERNAL_ERROR, "Error flushing" , t);
} }
@ -451,11 +451,6 @@ public class Http2ConnectionHandler extends ByteToMessageDecoder implements Http
ctx.write(msg, promise); ctx.write(msg, promise);
} }
@Override
public void flush(ChannelHandlerContext ctx) throws Exception {
ctx.flush();
}
@Override @Override
public void channelReadComplete(ChannelHandlerContext ctx) throws Exception { public void channelReadComplete(ChannelHandlerContext ctx) throws Exception {
// Trigger flush after read on the assumption that flush is cheap if there is nothing to write and that // Trigger flush after read on the assumption that flush is cheap if there is nothing to write and that