Skip to content

Commit 5835173

Browse files
lepdoulepdou
authored
Merge pull request apolloconfig#531 from nobodyiam/optimize-client-parse
Optimize client parse performance
2 parents 34d511f + 97d98f1 commit 5835173

File tree

30 files changed

+582
-71
lines changed

30 files changed

+582
-71
lines changed

‎apollo-adminservice/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.ctrip.framework.apollo</groupId>
66
<artifactId>apollo</artifactId>
7-
<version>0.4.1</version>
7+
<version>0.5.0-SNAPSHOT</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>

‎apollo-assembly/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.ctrip.framework.apollo</groupId>
66
<artifactId>apollo</artifactId>
7-
<version>0.4.1</version>
7+
<version>0.5.0-SNAPSHOT</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>

‎apollo-biz/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<artifactId>apollo</artifactId>
66
<groupId>com.ctrip.framework.apollo</groupId>
7-
<version>0.4.1</version>
7+
<version>0.5.0-SNAPSHOT</version>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010
<artifactId>apollo-biz</artifactId>

‎apollo-buildtools/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.ctrip.framework.apollo</groupId>
66
<artifactId>apollo</artifactId>
7-
<version>0.4.1</version>
7+
<version>0.5.0-SNAPSHOT</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>

‎apollo-client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.ctrip.framework.apollo</groupId>
66
<artifactId>apollo</artifactId>
7-
<version>0.4.1</version>
7+
<version>0.5.0-SNAPSHOT</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>

‎apollo-client/src/main/java/com/ctrip/framework/apollo/ConfigService.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ public class ConfigService {
2121
private static final ConfigService s_instance = new ConfigService();
2222

2323
private PlexusContainer m_container;
24-
private ConfigManager m_configManager;
25-
private ConfigRegistry m_configRegistry;
24+
private volatile ConfigManager m_configManager;
25+
private volatile ConfigRegistry m_configRegistry;
2626

2727
private ConfigService() {
2828
m_container = ContainerLoader.getDefaultContainer();
@@ -128,8 +128,10 @@ static void setConfigFactory(String namespace, ConfigFactory factory) {
128128

129129
// for test only
130130
static void setContainer(PlexusContainer m_container) {
131-
s_instance.m_container = m_container;
132-
s_instance.m_configManager = null;
133-
s_instance.m_configRegistry = null;
131+
synchronized (s_instance) {
132+
s_instance.m_container = m_container;
133+
s_instance.m_configManager = null;
134+
s_instance.m_configRegistry = null;
135+
}
134136
}
135137
}

0 commit comments

Comments
 (0)