Merge remote-tracking branch 'upstream/develop' into develop

2020-03-27 15:48:40 +08:00 · 2020-03-27 15:48:40 +08:00 · 5b8d8fd763
commit 5b8d8fd763
parent ea2a83c4be a16b72eba4
1 changed files with 3 additions and 0 deletions
--- a/naming/src/main/java/com/alibaba/nacos/naming/controllers/InstanceController.java
+++ b/naming/src/main/java/com/alibaba/nacos/naming/controllers/InstanceController.java
@ -280,6 +280,9 @@ public class InstanceController {
        if (clientBeat != null) {
            if (StringUtils.isNotBlank(clientBeat.getCluster())) {
                clusterName = clientBeat.getCluster();
+            } else {
+                // fix #2533
+                clientBeat.setCluster(clusterName);
            }
            ip = clientBeat.getIp();
            port = clientBeat.getPort();