From 6d7df2d057368186ea1d6d4e6640446fc6917350 Mon Sep 17 00:00:00 2001
From: Pritham Sriram Govindaraj <prithamsriram@gmail.com>
Date: Mon, 25 Sep 2023 08:04:58 -0500
Subject: [PATCH] fix flaky test
 com.ctrip.framework.apollo.configservice.service.AppNamespaceServiceWithCacheTest#testAppNamespace

---
 .../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<AppNamespace> appNamespaces) {
 
   //for those updated or deleted app namespaces
   private void updateAndDeleteCache() {
-    List<Long> ids = Lists.newArrayList(appNamespaceIdCache.keySet());
+    List<Long> ids = appNamespaceIdCache.keySet().stream().sorted().collect(Collectors.toList());
     if (CollectionUtils.isEmpty(ids)) {
       return;
     }