[servicecomb-java-chassis] branch master updated: [SCB-2789]available zone configuration default value should remains for null (#3770)

[liubao]

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

liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git


The following commit(s) were added to refs/heads/master by this push:
     new 772589b57 [SCB-2789]available zone configuration default value should 
remains for null (#3770)
772589b57 is described below

commit 772589b57ab06288ed8bd54e68458ea3becd8fa0
Author: liubao68 <bi...@qq.com>
AuthorDate: Fri May 5 11:34:27 2023 +0800

    [SCB-2789]available zone configuration default value should remains for 
null (#3770)
---
 .../registry/api/registry/MicroserviceInstance.java       | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git 
a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/api/registry/MicroserviceInstance.java
 
b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/api/registry/MicroserviceInstance.java
index fdab707d6..954fe0495 100644
--- 
a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/api/registry/MicroserviceInstance.java
+++ 
b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/api/registry/MicroserviceInstance.java
@@ -196,14 +196,19 @@ public class MicroserviceInstance {
 
   private static void loadDataCenterInfo(MicroserviceInstance 
microserviceInstance) {
     String dataCenterName = DynamicPropertyFactory.getInstance()
-        .getStringProperty("servicecomb.datacenter.name", "default")
+        .getStringProperty("servicecomb.datacenter.name", null)
         .get();
+    String region = DynamicPropertyFactory.getInstance().
+        getStringProperty("servicecomb.datacenter.region", null).get();
+    String availableZone = DynamicPropertyFactory.getInstance().
+        getStringProperty("servicecomb.datacenter.availableZone", null).get();
+    if (dataCenterName == null && region == null && availableZone == null) {
+      return;
+    }
     DataCenterInfo dataCenterInfo = new DataCenterInfo();
     dataCenterInfo.setName(dataCenterName);
-    dataCenterInfo.setRegion(DynamicPropertyFactory.getInstance().
-        getStringProperty("servicecomb.datacenter.region", "default").get());
-    dataCenterInfo.setAvailableZone(DynamicPropertyFactory.getInstance().
-        getStringProperty("servicecomb.datacenter.availableZone", 
"default").get());
+    dataCenterInfo.setRegion(region);
+    dataCenterInfo.setAvailableZone(availableZone);
     microserviceInstance.setDataCenterInfo(dataCenterInfo);
   }
 }