fix listenPort allow user defined

sierpys · Jan 9, 2019 · 8e642b9 · 8e642b9
1 parent 1886b12
commit 8e642b9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 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
@@ -53,7 +53,6 @@ public abstract class AbstractRpcRemotingServer extends AbstractRpcRemoting impl
     private final EventLoopGroup eventLoopGroupBoss;
     private final NettyServerConfig nettyServerConfig;
     private DefaultEventExecutorGroup defaultEventExecutorGroup;
-
     private int listenPort;
 
     public void setListenPort(int listenPort) {
@@ -99,7 +98,6 @@ public AbstractRpcRemotingServer(final NettyServerConfig nettyServerConfig,
         if (null != handlers) {
             channelHandlers = handlers;
         }
-        this.listenPort = nettyServerConfig.getListenPort();
 
     }
 
@@ -109,6 +107,9 @@ 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())
@@ -139,7 +140,7 @@ public void initChannel(SocketChannel ch) {
 
         try {
             LOGGER.info("Server starting ... ");
-            ChannelFuture future = this.serverBootstrap.bind(this.nettyServerConfig.getListenPort()).sync();
+            ChannelFuture future = this.serverBootstrap.bind(listenPort).sync();
             LOGGER.info("Server started ... ");
             future.channel().closeFuture().sync();
         } catch (InterruptedException exx) {

diff --git a/core/src/main/java/com/alibaba/fescar/core/rpc/netty/NettyServerConfig.java b/core/src/main/java/com/alibaba/fescar/core/rpc/netty/NettyServerConfig.java
@@ -42,7 +42,7 @@ public class NettyServerConfig extends NettyBaseConfig {
     private int soBackLogSize = 1024;
     private int writeBufferHighWaterMark = 67108864;
     private int writeBufferLowWaterMark = 1048576;
-    private int listenPort = 8091;
+    private static final int DEFAULT_LISTEN_PORT = 8091;
     private static final int RPC_REQUEST_TIMEOUT = 30 * 1000;
     private boolean enableServerPooledByteBufAllocator = true;
     private int serverChannelMaxIdleTimeSeconds = 30;
@@ -216,8 +216,8 @@ public void setWriteBufferLowWaterMark(int writeBufferLowWaterMark) {
      *
      * @return the listen port
      */
-    public int getListenPort() {
-        return listenPort;
+    public int getDefaultListenPort() {
+        return DEFAULT_LISTEN_PORT;
     }
 
     /**