bugfix: let getListenPort() always get the exact value

wudongpo · Jan 12, 2019 · f38c35e · f38c35e
1 parent 1593308
commit f38c35e
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/core/src/main/java/com/alibaba/fescar/core/rpc/netty/AbstractRpcRemotingServer.java b/core/src/main/java/com/alibaba/fescar/core/rpc/netty/AbstractRpcRemotingServer.java
@@ -19,6 +19,9 @@
 import java.net.InetSocketAddress;
 import java.util.concurrent.ThreadPoolExecutor;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.alibaba.fescar.common.thread.NamedThreadFactory;
 import com.alibaba.fescar.core.rpc.RemotingServer;
 
@@ -34,8 +37,6 @@
 import io.netty.channel.socket.SocketChannel;
 import io.netty.handler.timeout.IdleStateHandler;
 import io.netty.util.concurrent.DefaultEventExecutorGroup;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * The type Rpc remoting server.
@@ -98,6 +99,8 @@ public AbstractRpcRemotingServer(final NettyServerConfig nettyServerConfig,
         if (null != handlers) {
             channelHandlers = handlers;
         }
+        // init listenPort in constructor so that getListenPort() will always get the exact port
+        listenPort = nettyServerConfig.getDefaultListenPort();
 
     }
 
@@ -107,9 +110,7 @@ public void start() {
             nettyServerConfig.getServerWorkerThreads(),
             new NamedThreadFactory(nettyServerConfig.getExecutorThreadPrefix(),
                 nettyServerConfig.getServerWorkerThreads()));
-        if (listenPort == 0) {
-            listenPort = nettyServerConfig.getDefaultListenPort();
-        }
+
         this.serverBootstrap.group(this.eventLoopGroupBoss, this.eventLoopGroupWorker)
             .channel(nettyServerConfig.SERVER_CHANNEL_CLAZZ)
             .option(ChannelOption.SO_BACKLOG, nettyServerConfig.getSoBackLogSize())