diff --git a/build.gradle b/build.gradle index 45d87574be..5d3ac5b5e4 100644 --- a/build.gradle +++ b/build.gradle @@ -90,7 +90,7 @@ subprojects { protocPluginBaseName = 'protoc-gen-grpc-java' javaPluginPath = "$rootDir/compiler/build/exe/java_plugin/$protocPluginBaseName$exeSuffix" - nettyVersion = '4.1.13.Final' + nettyVersion = '4.1.14.Final' guavaVersion = '19.0' protobufVersion = '3.3.1' protocVersion = '3.3.0' // TODO(carl-mastrangelo): set this from protobufVersion when versions align again diff --git a/netty/src/test/java/io/grpc/netty/NettyClientHandlerTest.java b/netty/src/test/java/io/grpc/netty/NettyClientHandlerTest.java index 00a128f85a..71d87988ae 100644 --- a/netty/src/test/java/io/grpc/netty/NettyClientHandlerTest.java +++ b/netty/src/test/java/io/grpc/netty/NettyClientHandlerTest.java @@ -549,7 +549,8 @@ public class NettyClientHandlerTest extends NettyHandlerTestBase { } protected final void channelRead(Object obj) throws Exception { - handler().channelRead(ctx, obj); + channel.writeInbound(obj); } protected ByteBuf grpcDataFrame(int streamId, boolean endStream, byte[] content) { diff --git a/netty/src/test/java/io/grpc/netty/NettyServerHandlerTest.java b/netty/src/test/java/io/grpc/netty/NettyServerHandlerTest.java index 891553dbe6..8891bac3a0 100644 --- a/netty/src/test/java/io/grpc/netty/NettyServerHandlerTest.java +++ b/netty/src/test/java/io/grpc/netty/NettyServerHandlerTest.java @@ -498,12 +498,13 @@ public class NettyServerHandlerTest extends NettyHandlerTestBase