Merge branch 'dev' into dev

5 years ago · 090c32e416
1 changed files with 32 additions and 37 deletions
--- a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/NettyRemotingServer.java
+++ b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/NettyRemotingServer.java
@ -119,11 +119,7 @@ public class NettyRemotingServer {
     *  server start
     */
    public void start(){
-
-        if(this.isStarted.get()){
-            return;
-        }
-
+        if (isStarted.compareAndSet(false, true)) {
            this.serverBootstrap
                    .group(this.bossGroup, this.workGroup)
                    .channel(NioServerSocketChannel.class)
@ -155,8 +151,7 @@ public class NettyRemotingServer {
            } else {
                throw new RuntimeException(String.format("NettyRemotingServer bind %s fail", serverConfig.getListenPort()));
            }
-        //
-        isStarted.compareAndSet(false, true);
+        }
    }

    /**