commit 64cd920e40e60a5ec99e9c7520a6656fe8720c13
author liubao68 <bismy@qq.com> Fri May 05 11:34:27 2023 +0800
committer liubao68 <bismy@qq.com> Sat May 06 19:29:05 2023 +0800
tree 8a9484b4e02546e7bb4c7f3220b198aa9525e0fe
parent de34d86527886797b71389ac2fe3c019849b9453

[SCB-2789]available zone configuration default value should remains for null (#3770)

foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/api/registry/MicroserviceInstance.java

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 fdab707..954fe04 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 @@
 
   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);
   }
 }