[ISSUE #8366] When determining if ChannelWrapper is the wrapper for…

… a channel, no longer acquire a read lock.
apache · Jul 5, 2024 · 32f0e84 · 32f0e84
1 parent 77d6633
commit 32f0e84
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingClient.java b/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingClient.java
@@ -463,12 +463,10 @@ public void closeChannel(final Channel channel) {
                     for (Map.Entry<String, ChannelWrapper> entry : channelTables.entrySet()) {
                         String key = entry.getKey();
                         ChannelWrapper prev = entry.getValue();
-                        if (prev.getChannel() != null) {
-                            if (prev.getChannel() == channel) {
-                                prevCW = prev;
-                                addrRemote = key;
-                                break;
-                            }
+                        if (prev.isWrapperOf(channel)) {
+                            prevCW = prev;
+                            addrRemote = key;
+                            break;
                         }
                     }
 
@@ -1022,6 +1020,13 @@ public boolean isWritable() {
             return getChannel().isWritable();
         }
 
+        public boolean isWrapperOf(Channel channel) {
+            if (this.channelFuture.channel() != null && this.channelFuture.channel() == channel) {
+                return true;
+            }
+            return false;
+        }
+
         private Channel getChannel() {
             return getChannelFuture().channel();
         }