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

Http2ConnectionHandler not flushing on writabilityChange

Browse Source 
Motivation:
The Http2ConnectionHandler was writing pending bytes, but was not flushing. This may result in deadlock.

Modifications:
- Http2ConnectionHandler must writePendingBytes and also flush.

Result:
Data is now flushed after writabilityChange writes more data to underlying layers.
This commit is contained in:
Scott Mitchell 2015-08-03 12:46:29 -07:00
parent deda3f5b65
commit 2d4bef9b18
1 changed files with 7 additions and 4 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

@ -170,7 +170,7 @@ public class Http2ConnectionHandler extends ByteToMessageDecoder implements Http
@Override @Override
public void flush(ChannelHandlerContext ctx) throws Http2Exception { public void flush(ChannelHandlerContext ctx) throws Http2Exception {
// Trigger pending writes in the remote flow controller. // Trigger pending writes in the remote flow controller.
connection().remote().flowController().writePendingBytes(); encoder.flowController().writePendingBytes();
try { try {
ctx.flush(); ctx.flush();
} catch (Throwable t) { } catch (Throwable t) {
@ -399,11 +399,14 @@ public class Http2ConnectionHandler extends ByteToMessageDecoder implements Http
public void channelWritabilityChanged(ChannelHandlerContext ctx) throws Exception { public void channelWritabilityChanged(ChannelHandlerContext ctx) throws Exception {
// Writability is expected to change while we are writing. We cannot allow this event to trigger reentering // Writability is expected to change while we are writing. We cannot allow this event to trigger reentering
// the allocation and write loop. Reentering the event loop will lead to over or illegal allocation. // the allocation and write loop. Reentering the event loop will lead to over or illegal allocation.
try {
if (ctx.channel().isWritable()) { if (ctx.channel().isWritable()) {
encoder.flowController().writePendingBytes(); flush(ctx);
} }
} finally {
super.channelWritabilityChanged(ctx); super.channelWritabilityChanged(ctx);
} }
}
@Override @Override
protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception { protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {