[type:fix] e2e test error

moremind · Oct 21, 2023 · 51eda75 · 51eda75
1 parent 0914a8e
commit 51eda75
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/listener/AbstractDataChangedListener.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/listener/AbstractDataChangedListener.java
@@ -277,10 +277,12 @@ public final void afterPropertiesSet() {
      * @param data  the new config data
      */
     protected <T> void updateCache(final ConfigGroupEnum group, final List<T> data) {
-        String json = GsonUtils.getInstance().toJson(data);
-        ConfigDataCache newVal = new ConfigDataCache(group.name(), json, DigestUtils.md5Hex(json), System.currentTimeMillis());
-        ConfigDataCache oldVal = CACHE.put(newVal.getGroup(), newVal);
-        LOG.info("update config cache[{}], old: {}, updated: {}", group, oldVal, newVal);
+        synchronized (CACHE) {
+            String json = GsonUtils.getInstance().toJson(data);
+            ConfigDataCache newVal = new ConfigDataCache(group.name(), json, DigestUtils.md5Hex(json), System.currentTimeMillis());
+            ConfigDataCache oldVal = CACHE.put(newVal.getGroup(), newVal);
+            LOG.info("update config cache[{}], old: {}, updated: {}", group, oldVal, newVal);
+        }
     }
 
     /**

diff --git a/...c/main/java/org/apache/shenyu/admin/listener/http/HttpLongPollingDataChangedListener.java b/...c/main/java/org/apache/shenyu/admin/listener/http/HttpLongPollingDataChangedListener.java
@@ -223,7 +223,7 @@ private boolean checkCacheDelayAndUpdate(final ConfigDataCache serverCache, fina
         if (latest != serverCache) {
             return !StringUtils.equals(clientMd5, latest.getMd5());
         }
-        synchronized (this) {
+        synchronized (CACHE) {
             latest = CACHE.get(serverCache.getGroup());
             if (latest != serverCache) {
                 return !StringUtils.equals(clientMd5, latest.getMd5());