opensource/rocketmq
3
0
Fork 0
mirror of https://github.com/apache/rocketmq.git synced 2026-10-30 18:44:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1109 from zhanguohuang/develop-fix-NettyRemotingClient

Browse Source 
[ISSUE #1108] Fix concurrent problems with client-side connection creation
This commit is contained in:
Heng Du
2019-09-19 10:37:16 +08:00
committed by GitHub
parent d71495a1a1 435b849d30
commit c4d95fc993
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingClient.java
+2 -5
View File
@@ -453,8 +453,7 @@ public class NettyRemotingClient extends NettyRemotingAbstract implements Remoti
private Channel createChannel(final String addr) throws InterruptedException {
ChannelWrapper cw = this.channelTables.get(addr);
if (cw != null && cw.isOK()) {
cw.getChannel().close();
channelTables.remove(addr);
return cw.getChannel();
}
if (this.lockChannelTables.tryLock(LOCK_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)) {
@@ -464,9 +463,7 @@ public class NettyRemotingClient extends NettyRemotingAbstract implements Remoti
if (cw != null) {
if (cw.isOK()) {
cw.getChannel().close();
this.channelTables.remove(addr);
createNewConnection = true;
return cw.getChannel();
} else if (!cw.getChannelFuture().isDone()) {
createNewConnection = false;
} else {