Merge branch 'master' into P2cLoadBalancer

apache · Mar 9, 2023 · b33e200 · b33e200
2 parents f480a5d + 8695376
commit b33e200
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/UpstreamCheckService.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/UpstreamCheckService.java
@@ -316,6 +316,7 @@ private void check(final String selectorId, final List<CommonUpstream> upstreamL
                     if (!commonUpstream.isStatus()) {
                         commonUpstream.setTimestamp(System.currentTimeMillis());
                         commonUpstream.setStatus(true);
+                        PENDING_SYNC.add(commonUpstream.hashCode());
                         LOG.info("UpstreamCacheManager check success the url: {}, host: {} ", commonUpstream.getUpstreamUrl(), commonUpstream.getUpstreamHost());
                     }
                     return commonUpstream;

diff --git a/...c/test/java/org/apache/shenyu/client/springmvc/init/SpringMvcClientEventListenerTest.java b/...c/test/java/org/apache/shenyu/client/springmvc/init/SpringMvcClientEventListenerTest.java
@@ -156,6 +156,7 @@ public void testOnApplicationEvent() {
         // hit `!registered.compareAndSet(false, true)`
         springMvcClientEventListener.onApplicationEvent(contextRefreshedEvent);
         portUtilsMockedStatic.close();
+        registerUtilsMockedStatic.close();
     }
 
     @Test