Merge branch 'apache-3.2' into 3.2.2-release

apache · May 20, 2023 · 7a41c55 · 7a41c55
2 parents a557480 + 1671332
commit 7a41c55
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/...emoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyChannel.java b/...emoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyChannel.java
@@ -72,7 +72,7 @@ final class NettyChannel extends AbstractChannel {
 
     private final Netty4BatchWriteQueue writeQueue;
 
-    private final Codec2 codec;
+    private Codec2 codec;
 
     private final boolean encodeInIOThread;
 
@@ -365,4 +365,8 @@ private static Codec2 getChannelCodec(URL url) {
             return frameworkModel.getExtensionLoader(Codec2.class).getExtension("default");
         }
     }
+
+    public void setCodec(Codec2 codec) {
+        this.codec = codec;
+    }
 }
diff --git a/...-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyConfigOperator.java b/...-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyConfigOperator.java
@@ -60,6 +60,7 @@ public void configChannelHandler(List<ChannelHandler> handlerList) {
         }
 
         if (!(codec2 instanceof DefaultCodec)){
+            ((NettyChannel) channel).setCodec(codec2);
             NettyCodecAdapter codec = new NettyCodecAdapter(codec2, channel.getUrl(), handler);
             ((NettyChannel) channel).getNioChannel().pipeline().addLast(
                 codec.getDecoder()