From 2cb6ecc3b31c63be503e63d03a27bda1ac3ecb85 Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Tue, 14 Mar 2017 14:08:03 -0700 Subject: [PATCH] netty: Backport SETTINGS ACK sequencing fix This fix was made in netty/netty#6521. Fixes #2801 --- .../netty/java/io/grpc/netty/FixedHttp2ConnectionDecoder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/netty/third_party/netty/java/io/grpc/netty/FixedHttp2ConnectionDecoder.java b/netty/third_party/netty/java/io/grpc/netty/FixedHttp2ConnectionDecoder.java index f7444805a9..a3c9b578d6 100644 --- a/netty/third_party/netty/java/io/grpc/netty/FixedHttp2ConnectionDecoder.java +++ b/netty/third_party/netty/java/io/grpc/netty/FixedHttp2ConnectionDecoder.java @@ -450,11 +450,11 @@ public class FixedHttp2ConnectionDecoder implements Http2ConnectionDecoder { @Override public void onSettingsRead(ChannelHandlerContext ctx, Http2Settings settings) throws Http2Exception { - encoder.remoteSettings(settings); - // Acknowledge receipt of the settings. encoder.writeSettingsAck(ctx, ctx.newPromise()); + encoder.remoteSettings(settings); + listener.onSettingsRead(ctx, settings); }