alibaba#498 fix bug

tguangch · Jan 15, 2019 · 705a47e · 705a47e
1 parent 7abee38
commit 705a47e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/naming/src/main/java/com/alibaba/nacos/naming/core/DomainsManager.java b/naming/src/main/java/com/alibaba/nacos/naming/core/DomainsManager.java
@@ -474,6 +474,11 @@ public Map<String, Domain> getDomMap(String namespaceId) {
     public int getPagedDom(String namespaceId, int startPage, int pageSize, String keyword, List<Domain> domainList) {
 
         List<Domain> matchList;
+
+        if (chooseDomMap(namespaceId) == null) {
+            return 0;
+        }
+
         if (StringUtils.isNotBlank(keyword)) {
             matchList = searchDomains(namespaceId, ".*" + keyword + ".*");
         } else {

diff --git a/naming/src/main/java/com/alibaba/nacos/naming/healthcheck/ClientBeatCheckTask.java b/naming/src/main/java/com/alibaba/nacos/naming/healthcheck/ClientBeatCheckTask.java
@@ -82,7 +82,7 @@ private void deleteIP(IpAddress ipAddress) {
                 + ipAddress.getWeight() + "_" + ipAddress.getClusterName();
             String url = "http://127.0.0.1:" + RunningConfig.getServerPort() + RunningConfig.getContextPath()
                 + UtilsAndCommons.NACOS_NAMING_CONTEXT + "/api/remvIP4Dom?dom="
-                + domain.getName() + "&ipList=" + ipList + "&token=" + domain.getToken();
+                + domain.getName() + "&ipList=" + ipList + "&token=" + domain.getToken() + "&namespaceId=" + domain.getNamespaceId();
             HttpClient.HttpResult result = HttpClient.httpGet(url, null, null);
             if (result.code != HttpURLConnection.HTTP_OK) {
                 Loggers.SRV_LOG.error("[IP-DEAD] failed to delete ip automatically, ip: {}, caused {}, resp code: {}",