From a632cc13fccb8e52d3b29f35ac99e3db55a5d47c Mon Sep 17 00:00:00 2001 From: Pritham Sriram Govindaraj <75803408+ThugJudy@users.noreply.github.com> Date: Thu, 19 Oct 2023 19:38:48 -0500 Subject: [PATCH] fix flaky test com.ctrip.framework.apollo.configservice.service.AppNamespaceServiceWithCacheTest#testAppNamespace (#4998) --- .../configservice/service/AppNamespaceServiceWithCache.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/service/AppNamespaceServiceWithCache.java b/apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/service/AppNamespaceServiceWithCache.java index e495043708d..dd71ae38793 100644 --- a/apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/service/AppNamespaceServiceWithCache.java +++ b/apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/service/AppNamespaceServiceWithCache.java @@ -44,6 +44,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; /** * @author Jason Song(song_s@ctrip.com) @@ -194,7 +195,7 @@ private void mergeAppNamespaces(List appNamespaces) { //for those updated or deleted app namespaces private void updateAndDeleteCache() { - List ids = Lists.newArrayList(appNamespaceIdCache.keySet()); + List ids = appNamespaceIdCache.keySet().stream().sorted().collect(Collectors.toList()); if (CollectionUtils.isEmpty(ids)) { return; }