Merge pull request #531 from nobodyiam/optimize-client-parse

Optimize client parse performance
apolloconfig · Jan 24, 2017 · 5835173 · 5835173
2 parents 34d511f + 97d98f1
commit 5835173
Show file tree

Hide file tree

Showing 30 changed files with 582 additions and 71 deletions.
diff --git a/apollo-adminservice/pom.xml b/apollo-adminservice/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.ctrip.framework.apollo</groupId>
 		<artifactId>apollo</artifactId>
-		<version>0.4.1</version>
+		<version>0.5.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

diff --git a/apollo-assembly/pom.xml b/apollo-assembly/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.ctrip.framework.apollo</groupId>
 		<artifactId>apollo</artifactId>
-		<version>0.4.1</version>
+		<version>0.5.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

diff --git a/apollo-biz/pom.xml b/apollo-biz/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>apollo</artifactId>
 		<groupId>com.ctrip.framework.apollo</groupId>
-		<version>0.4.1</version>
+		<version>0.5.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>apollo-biz</artifactId>

diff --git a/apollo-buildtools/pom.xml b/apollo-buildtools/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.ctrip.framework.apollo</groupId>
 		<artifactId>apollo</artifactId>
-		<version>0.4.1</version>
+		<version>0.5.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

diff --git a/apollo-client/pom.xml b/apollo-client/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.ctrip.framework.apollo</groupId>
 		<artifactId>apollo</artifactId>
-		<version>0.4.1</version>
+		<version>0.5.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/ConfigService.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/ConfigService.java
@@ -21,8 +21,8 @@ public class ConfigService {
   private static final ConfigService s_instance = new ConfigService();
 
   private PlexusContainer m_container;
-  private ConfigManager m_configManager;
-  private ConfigRegistry m_configRegistry;
+  private volatile ConfigManager m_configManager;
+  private volatile ConfigRegistry m_configRegistry;
 
   private ConfigService() {
     m_container = ContainerLoader.getDefaultContainer();
@@ -128,8 +128,10 @@ static void setConfigFactory(String namespace, ConfigFactory factory) {
 
   // for test only
   static void setContainer(PlexusContainer m_container) {
-    s_instance.m_container = m_container;
-    s_instance.m_configManager = null;
-    s_instance.m_configRegistry = null;
+    synchronized (s_instance) {
+      s_instance.m_container = m_container;
+      s_instance.m_configManager = null;
+      s_instance.m_configRegistry = null;
+    }
   }
 }