bugfix : fix rpcContext.getClientRMHolderMap() npe (apache#4928)

conghuhu · Sep 13, 2022 · bdb54a0 · bdb54a0
1 parent 247cf21
commit bdb54a0
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/core/src/main/java/io/seata/core/rpc/netty/ChannelManager.java b/core/src/main/java/io/seata/core/rpc/netty/ChannelManager.java
@@ -240,10 +240,13 @@ public static Channel getSameClientChannel(Channel channel) {
             ConcurrentMap<Integer, RpcContext> clientRpcMap = TM_CHANNELS.get(clientIdentified);
             return getChannelFromSameClientMap(clientRpcMap, clientPort);
         } else if (clientRole == NettyPoolKey.TransactionRole.RMROLE) {
-            for (Map<Integer, RpcContext> clientRmMap : rpcContext.getClientRMHolderMap().values()) {
-                Channel sameClientChannel = getChannelFromSameClientMap(clientRmMap, clientPort);
-                if (sameClientChannel != null) {
-                    return sameClientChannel;
+            ConcurrentMap<String, ConcurrentMap<Integer, RpcContext>> clientRMHolderMap = rpcContext.getClientRMHolderMap();
+            if (CollectionUtils.isNotEmpty(clientRMHolderMap)) {
+                for (Map<Integer, RpcContext> clientRmMap : clientRMHolderMap.values()) {
+                    Channel sameClientChannel = getChannelFromSameClientMap(clientRmMap, clientPort);
+                    if (sameClientChannel != null) {
+                        return sameClientChannel;
+                    }
                 }
             }
         }