From ca9a1c2365a7a2799baf94bbe1d9b2cb3cf76a80 Mon Sep 17 00:00:00 2001
From: jimin <slievrly@gmail.com>
Date: Tue, 18 Feb 2020 00:01:08 +0800
Subject: [PATCH] bugfix: fix channelHandler not sharable (#2258)

---
 .../seata/core/rpc/netty/AbstractRpcRemotingClient.java   | 2 ++
 core/src/main/java/io/seata/core/rpc/netty/RpcServer.java | 8 +++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/io/seata/core/rpc/netty/AbstractRpcRemotingClient.java b/core/src/main/java/io/seata/core/rpc/netty/AbstractRpcRemotingClient.java
index 18631387257..6c9f9e221a2 100644
--- a/core/src/main/java/io/seata/core/rpc/netty/AbstractRpcRemotingClient.java
+++ b/core/src/main/java/io/seata/core/rpc/netty/AbstractRpcRemotingClient.java
@@ -26,6 +26,7 @@
 import java.util.function.Function;
 
 import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandler.Sharable;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.timeout.IdleState;
 import io.netty.handler.timeout.IdleStateEvent;
@@ -273,6 +274,7 @@ private void printMergeMessageLog(MergedWarpMessage mergeMessage) {
     /**
      * The type ClientHandler.
      */
+    @Sharable
     class ClientHandler extends AbstractHandler {
 
         @Override
diff --git a/core/src/main/java/io/seata/core/rpc/netty/RpcServer.java b/core/src/main/java/io/seata/core/rpc/netty/RpcServer.java
index 83076e7f309..9f305ff7b70 100644
--- a/core/src/main/java/io/seata/core/rpc/netty/RpcServer.java
+++ b/core/src/main/java/io/seata/core/rpc/netty/RpcServer.java
@@ -15,8 +15,10 @@
  */
 package io.seata.core.rpc.netty;
 
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeoutException;
+
 import io.netty.channel.Channel;
-import io.netty.channel.ChannelHandler.Sharable;
 import io.seata.core.protocol.HeartbeatMessage;
 import io.seata.core.protocol.RpcMessage;
 import io.seata.core.rpc.ChannelManager;
@@ -24,15 +26,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeoutException;
-
 /**
  * The type Abstract rpc server.
  *
  * @author slievrly
  */
-@Sharable
 public class RpcServer extends AbstractRpcRemotingServer {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(RpcServer.class);