Revert "fix StreamBufferingEncoder"

This reverts commit 95060b2.
grpc · Apr 5, 2021 · 43324ef · 43324ef
1 parent ab719bd
commit 43324ef
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/netty/src/main/java/io/grpc/netty/StreamBufferingEncoder.java b/netty/src/main/java/io/grpc/netty/StreamBufferingEncoder.java
@@ -60,8 +60,6 @@
  * <p>This implementation makes the buffering mostly transparent and is expected to be used as a
  * drop-in decorator of {@link io.netty.handler.codec.http2.DefaultHttp2ConnectionEncoder}.
  */
-// This is a temporary copy of {@link io.netty.handler.codec.http2.DecoratingHttp2ConnectionEncoder}
-// with a bug fix that is not available yet in the latest netty release.
 class StreamBufferingEncoder extends DecoratingHttp2ConnectionEncoder {
 
   /**
@@ -155,7 +153,11 @@ public ChannelFuture writeHeaders(ChannelHandlerContext ctx, int streamId, Http2
     if (closed) {
       return promise.setFailure(new Http2ChannelClosedException());
     }
-    if (isExistingStream(streamId) || canCreateStream()) {
+    if (isExistingStream(streamId) || connection().goAwayReceived()) {
+      return super.writeHeaders(ctx, streamId, headers, streamDependency, weight,
+          exclusive, padding, endOfStream, promise);
+    }
+    if (canCreateStream()) {
       return super.writeHeaders(ctx, streamId, headers, streamDependency, weight,
           exclusive, padding, endOfStream, promise);
     }