Fix beanName2SpringValueDefinitions cache issue

apolloconfig · Jan 21, 2023 · 8d17de5 · 8d17de5
1 parent af2751f
commit 8d17de5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -17,5 +17,7 @@ Apollo Java 2.1.0
 * [apollo-client-config-data support spring boot 3.0](https://github.com/apolloconfig/apollo-java/pull/5)
 * [Add apollo-plugin-log4j2 module to support log4j2.xml integration](https://github.com/apolloconfig/apollo-java/pull/6)
 * [Allow users to config comma-separated namespaces for ApolloConfigChangeListener](https://github.com/apolloconfig/apollo-java/pull/11)
+* [Fix beanName2SpringValueDefinitions cache issue](https://github.com/apolloconfig/apollo-java/pull/16)
+
 ------------------
 All issues and pull requests are [here](https://github.com/apolloconfig/apollo-java/milestone/1?closed=1)
diff --git a/.../main/java/com/ctrip/framework/apollo/spring/property/SpringValueDefinitionProcessor.java b/.../main/java/com/ctrip/framework/apollo/spring/property/SpringValueDefinitionProcessor.java
@@ -73,10 +73,8 @@ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
   }
 
   public static Multimap<String, SpringValueDefinition> getBeanName2SpringValueDefinitions(BeanDefinitionRegistry registry) {
-    Multimap<String, SpringValueDefinition> springValueDefinitions = beanName2SpringValueDefinitions.get(registry);
-    if (springValueDefinitions == null) {
-      springValueDefinitions = LinkedListMultimap.create();
-    }
+    Multimap<String, SpringValueDefinition> springValueDefinitions = beanName2SpringValueDefinitions.computeIfAbsent(
+        registry, k -> LinkedListMultimap.create());
 
     return springValueDefinitions;
   }