netty: record ByteBuf access in Netty{Client,Server}Stream before cal…

…ling MessageDeframer (#6027)
grpc · Aug 2, 2019 · 4faad27 · 4faad27
1 parent 4e4d4d8
commit 4faad27
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/netty/src/main/java/io/grpc/netty/NettyClientStream.java b/netty/src/main/java/io/grpc/netty/NettyClientStream.java
@@ -174,7 +174,8 @@ public void operationComplete(ChannelFuture future) throws Exception {
     private void writeFrameInternal(
         WritableBuffer frame, boolean endOfStream, boolean flush, final int numMessages) {
       Preconditions.checkArgument(numMessages >= 0);
-      ByteBuf bytebuf = frame == null ? EMPTY_BUFFER : ((NettyWritableBuffer) frame).bytebuf();
+      ByteBuf bytebuf =
+          frame == null ? EMPTY_BUFFER : ((NettyWritableBuffer) frame).bytebuf().touch();
       final int numBytes = bytebuf.readableBytes();
       if (numBytes > 0) {
         // Add the bytes to outbound flow control.

diff --git a/netty/src/main/java/io/grpc/netty/NettyServerStream.java b/netty/src/main/java/io/grpc/netty/NettyServerStream.java
@@ -150,7 +150,7 @@ private void writeFrameInternal(WritableBuffer frame, boolean flush, final int n
         writeQueue.scheduleFlush();
         return;
       }
-      ByteBuf bytebuf = ((NettyWritableBuffer) frame).bytebuf();
+      ByteBuf bytebuf = ((NettyWritableBuffer) frame).bytebuf().touch();
       final int numBytes = bytebuf.readableBytes();
       // Add the bytes to outbound flow control.
       onSendingBytes(numBytes);