Merge 5e83579 into 2e7c1db

apache · Feb 17, 2023 · 736bfbd · 736bfbd
2 parents 2e7c1db + 5e83579
commit 736bfbd
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/...registry/src/main/java/org/apache/servicecomb/registry/consumer/MicroserviceVersions.java b/...registry/src/main/java/org/apache/servicecomb/registry/consumer/MicroserviceVersions.java
@@ -42,6 +42,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.annotations.VisibleForTesting;
+
 public class MicroserviceVersions {
   private static final Logger LOGGER = LoggerFactory.getLogger(MicroserviceVersions.class);
 
@@ -120,13 +122,18 @@ public String getShortName() {
     return shortName;
   }
 
+  @VisibleForTesting
   public Map<String, MicroserviceVersion> getVersions() {
-    return versions;
+    synchronized (lock) {
+      return versions;
+    }
   }
 
   @SuppressWarnings("unchecked")
   public <T extends MicroserviceVersion> T getVersion(String serviceId) {
-    return (T) versions.get(serviceId);
+    synchronized (lock) {
+      return (T) versions.get(serviceId);
+    }
   }
 
   public String getRevision() {
@@ -318,10 +325,11 @@ protected boolean isEventAccept(MicroserviceInstanceChangedEvent changedEvent) {
   }
 
   public void destroy() {
-    for (MicroserviceVersion microserviceVersion : versions.values()) {
-      microserviceVersion.destroy();
+    synchronized (lock) {
+      for (MicroserviceVersion microserviceVersion : versions.values()) {
+        microserviceVersion.destroy();
+      }
     }
-
     appManager.getEventBus().post(new DestroyMicroserviceEvent(this));
   }
 }