[incubator-dolphinscheduler] branch 1.2.1-release updated: fix Monitor bug (#1656)

[lgcareer]

This is an automated email from the ASF dual-hosted git repository.

lgcareer pushed a commit to branch 1.2.1-release
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git


The following commit(s) were added to refs/heads/1.2.1-release by this push:
     new 41ce72b  fix Monitor bug (#1656)
41ce72b is described below

commit 41ce72bcb5af3b896d09b27fedef54cad2c3fac3
Author: bao liang <29528966+len...@users.noreply.github.com>
AuthorDate: Tue Dec 31 15:56:29 2019 +0800

    fix Monitor bug (#1656)
    
    * fix Monitor bug
    
    * fix zk monitor bug
---
 .../dolphinscheduler/api/service/MonitorService.java | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git 
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/MonitorService.java
 
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/MonitorService.java
index 91e58ef..118c5ce 100644
--- 
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/MonitorService.java
+++ 
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/MonitorService.java
@@ -33,6 +33,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import static org.apache.dolphinscheduler.common.utils.Preconditions.*;
+
 /**
  * monitor service
  */
@@ -116,20 +118,10 @@ public class MonitorService extends BaseService{
   }
 
   public List<Server> getServerListFromZK(boolean isMaster){
-    List<Server> servers = new ArrayList<>();
-    ZookeeperMonitor zookeeperMonitor = null;
-    try{
-      zookeeperMonitor = new ZookeeperMonitor();
-      ZKNodeType zkNodeType = isMaster ? ZKNodeType.MASTER : ZKNodeType.WORKER;
-      servers = zookeeperMonitor.getServersList(zkNodeType);
-    }catch (Exception e){
-      throw e;
-    }finally {
-      if(zookeeperMonitor != null){
-        zookeeperMonitor.close();
-      }
-    }
-    return servers;
+
+    checkNotNull(zookeeperMonitor);
+    ZKNodeType zkNodeType = isMaster ? ZKNodeType.MASTER : ZKNodeType.WORKER;
+    return zookeeperMonitor.getServersList(zkNodeType);
   }
 
 }