From dc4e46db410ef7fcd2a1d5efd89ffdd509b76245 Mon Sep 17 00:00:00 2001
From: loushang <loushang@vipkid.com.cn>
Date: Mon, 30 Dec 2019 18:58:38 +0800
Subject: [PATCH] fix Monitor bug

---
 .../api/service/MonitorService.java           | 19 +++++--------------
 1 file changed, 5 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 91e58ef6cc..e9877216f1 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,9 @@ 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;
+
+    ZKNodeType zkNodeType = isMaster ? ZKNodeType.MASTER : ZKNodeType.WORKER;
+    return checkNotNull(zookeeperMonitor).getServersList(zkNodeType);
   }
 
 }