Use queue#take instead of poll (#3765)

* Use queue#take instead of poll to avoid cs (#3764) * update CHANGES.md * update CHANGES.md Co-authored-by: kezhenxu94 <[email protected]> Co-authored-by: wxq <[email protected]> Co-authored-by: Jason Song <[email protected]>
apolloconfig · Jun 28, 2021 · d5200df · d5200df
1 parent 1b3424f
commit d5200df
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -46,6 +46,7 @@ Apollo 1.9.0
 * [feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent](https://github.com/ctripcorp/apollo/pull/3666)
 * [add More... link for known users](https://github.com/ctripcorp/apollo/pull/3757)
 * [update OIDC documentation](https://github.com/ctripcorp/apollo/pull/3766)
+* [Use queue#take instead of poll](https://github.com/ctripcorp/apollo/pull/3765)
 * [feature: add Spring Boot 2.4 config data loader support](https://github.com/ctripcorp/apollo/pull/3754)
 * [feat(open-api): get authorized apps](https://github.com/ctripcorp/apollo/pull/3647)
 * [feature: shared session for multi apollo portal](https://github.com/ctripcorp/apollo/pull/3786)

diff --git a/.../src/main/java/com/ctrip/framework/apollo/configservice/util/InstanceConfigAuditUtil.java b/.../src/main/java/com/ctrip/framework/apollo/configservice/util/InstanceConfigAuditUtil.java
@@ -169,11 +169,7 @@ public void afterPropertiesSet() throws Exception {
     auditExecutorService.submit(() -> {
       while (!auditStopped.get() && !Thread.currentThread().isInterrupted()) {
         try {
-          InstanceConfigAuditModel model = audits.poll();
-          if (model == null) {
-            TimeUnit.SECONDS.sleep(1);
-            continue;
-          }
+          InstanceConfigAuditModel model = audits.take();
           doAudit(model);
         } catch (Throwable ex) {
           Tracer.logError(ex);