Merge pull request #205 from realJackSun/0.2.8-bugfix

release 0.2.8-bugfix, Fix the thread-safety problem in NacosConfigurationPropertiesBinder
nacos-group · Jul 14, 2021 · b2fb611 · b2fb611
2 parents 1ffd948 + b87a413
commit b2fb611
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/...ain/java/com/alibaba/boot/nacos/config/binder/NacosBootConfigurationPropertiesBinder.java b/...ain/java/com/alibaba/boot/nacos/config/binder/NacosBootConfigurationPropertiesBinder.java
@@ -57,18 +57,18 @@ public NacosBootConfigurationPropertiesBinder(
 	protected void doBind(Object bean, String beanName, String dataId, String groupId,
 			String configType, NacosConfigurationProperties properties, String content,
 			ConfigService configService) {
-		String name = "nacos-bootstrap-" + beanName;
-		NacosPropertySource propertySource = new NacosPropertySource(name, dataId,
-				groupId, content, configType);
-		environment.getPropertySources().addLast(propertySource);
-		Binder binder = Binder.get(environment);
-		ResolvableType type = getBeanType(bean, beanName);
-		Bindable<?> target = Bindable.of(type).withExistingValue(bean);
-		binder.bind(properties.prefix(), target);
-		publishBoundEvent(bean, beanName, dataId, groupId, properties, content,
-				configService);
-		publishMetadataEvent(bean, beanName, dataId, groupId, properties);
-		environment.getPropertySources().remove(name);
+		synchronized (this) {
+			String name = "nacos-bootstrap-" + beanName;
+			NacosPropertySource propertySource = new NacosPropertySource(name, dataId, groupId, content, configType);
+			environment.getPropertySources().addLast(propertySource);
+			Binder binder = Binder.get(environment);
+			ResolvableType type = getBeanType(bean, beanName);
+			Bindable<?> target = Bindable.of(type).withExistingValue(bean);
+			binder.bind(properties.prefix(), target);
+			publishBoundEvent(bean, beanName, dataId, groupId, properties, content, configService);
+			publishMetadataEvent(bean, beanName, dataId, groupId, properties);
+			environment.getPropertySources().remove(name);
+		}
 	}
 
 	private ResolvableType getBeanType(Object bean, String beanName) {

diff --git a/...ain/java/com/alibaba/boot/nacos/discovery/autoconfigure/NacosDiscoveryAutoDeregister.java b/...ain/java/com/alibaba/boot/nacos/discovery/autoconfigure/NacosDiscoveryAutoDeregister.java
@@ -21,7 +21,7 @@
 import com.alibaba.nacos.api.annotation.NacosInjected;
 import com.alibaba.nacos.api.exception.NacosException;
 import com.alibaba.nacos.api.naming.NamingService;
-import com.alibaba.nacos.api.utils.NetUtils;
+import com.alibaba.nacos.client.naming.utils.NetUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/.../main/java/com/alibaba/boot/nacos/discovery/autoconfigure/NacosDiscoveryAutoRegister.java b/.../main/java/com/alibaba/boot/nacos/discovery/autoconfigure/NacosDiscoveryAutoRegister.java
@@ -21,7 +21,7 @@
 import com.alibaba.nacos.api.annotation.NacosInjected;
 import com.alibaba.nacos.api.exception.NacosException;
 import com.alibaba.nacos.api.naming.NamingService;
-import com.alibaba.nacos.api.utils.NetUtils;
+import com.alibaba.nacos.client.naming.utils.NetUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/nacos-spring-boot-parent/pom.xml b/nacos-spring-boot-parent/pom.xml
@@ -36,7 +36,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <spring-boot.version>2.0.3.RELEASE</spring-boot.version>
-        <nacos-spring-context.version>1.1.0</nacos-spring-context.version>
+        <nacos-spring-context.version>1.1.1</nacos-spring-context.version>
         <!-- Build args -->
         <argline>-server -Xms256m -Xmx512m -XX:PermSize=64m -XX:MaxPermSize=128m -Dfile.encoding=UTF-8
             -Djava.net.preferIPv4Stack=true
@@ -52,7 +52,7 @@
         <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
         <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
         <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
-        <nacos.version>2.0.2</nacos.version>
+        <nacos.version>1.4.2</nacos.version>
     </properties>
 
     <dependencyManagement>

diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
         <version>7</version>
     </parent>
     <properties>
-        <revision>0.2.9</revision>
+        <revision>0.2.8-bugfix</revision>
         <maven_javadoc_version>3.0.1</maven_javadoc_version>
         <maven_surefire_version>2.19.1</maven_surefire_version>
         <maven-source-plugin.version>3.1.0</maven-source-plugin.version>