Support concurrent loading of Config for different namespaces (#29)

apolloconfig · Aug 11, 2023 · f351a6a · f351a6a
1 parent 265fe49
commit f351a6a
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/DefaultConfigManager.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/DefaultConfigManager.java
@@ -33,7 +33,9 @@ public class DefaultConfigManager implements ConfigManager {
   private ConfigFactoryManager m_factoryManager;
 
   private Map<String, Config> m_configs = Maps.newConcurrentMap();
+  private Map<String, Object> m_configLocks = Maps.newConcurrentMap();
   private Map<String, ConfigFile> m_configFiles = Maps.newConcurrentMap();
+  private Map<String, Object> m_configFileLocks = Maps.newConcurrentMap();
 
   public DefaultConfigManager() {
     m_factoryManager = ApolloInjector.getInstance(ConfigFactoryManager.class);
@@ -44,7 +46,8 @@ public Config getConfig(String namespace) {
     Config config = m_configs.get(namespace);
 
     if (config == null) {
-      synchronized (this) {
+      Object lock = m_configLocks.computeIfAbsent(namespace, key -> new Object());
+      synchronized (lock) {
         config = m_configs.get(namespace);
 
         if (config == null) {
@@ -65,7 +68,8 @@ public ConfigFile getConfigFile(String namespace, ConfigFileFormat configFileFor
     ConfigFile configFile = m_configFiles.get(namespaceFileName);
 
     if (configFile == null) {
-      synchronized (this) {
+      Object lock = m_configFileLocks.computeIfAbsent(namespaceFileName, key -> new Object());
+      synchronized (lock) {
         configFile = m_configFiles.get(namespaceFileName);
 
         if (configFile == null) {