Merge pull request alibaba#1002 from alibaba/hotfix_remove_service_fa…

…iled alibaba#961 init cluster after instantiate cluster
killersteps · Apr 4, 2019 · 53d154d · 53d154d
2 parents 539280c + 35edfd4
commit 53d154d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/naming/src/main/java/com/alibaba/nacos/naming/core/Cluster.java b/naming/src/main/java/com/alibaba/nacos/naming/core/Cluster.java
@@ -99,7 +99,9 @@ public void init() {
     }
 
     public void destroy() {
-        checkTask.setCancelled(true);
+        if (checkTask != null) {
+            checkTask.setCancelled(true);
+        }
     }
 
     public HealthCheckTask getHealthCheckTask() {

diff --git a/naming/src/main/java/com/alibaba/nacos/naming/core/Service.java b/naming/src/main/java/com/alibaba/nacos/naming/core/Service.java
@@ -217,6 +217,7 @@ public void updateIPs(Collection<Instance> instances, boolean ephemeral) {
                         instance.getClusterName(), instance.toJSON());
                     Cluster cluster = new Cluster(instance.getClusterName());
                     cluster.setService(this);
+                    cluster.init();
                     getClusterMap().put(instance.getClusterName(), cluster);
                 }