Skip to content

release 1.1.1: Fix the thread-safety problem in NacosConfigurationPropertiesBinder #267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
realJackSun wants to merge 1 commit into
base: master
Choose a base branch
from
Open

release 1.1.1: Fix the thread-safety problem in NacosConfigurationPropertiesBinder #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions nacos-spring-context/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
<parent>
<artifactId>nacos-spring-parent</artifactId>
<groupId>com.alibaba.nacos</groupId>
<version>1.1.0</version>
<version>1.1.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-spring-context</artifactId>
<version>1.1.0</version>
<version>1.1.1</version>
<name>Alibaba Nacos :: Spring :: Context</name>
<packaging>jar</packaging>

Expand Down
14 changes: 7 additions & 7 deletions ...om/alibaba/nacos/spring/context/properties/config/NacosConfigurationPropertiesBinder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,13 @@ protected void bind(final Object bean, final String beanName,

// Add a Listener if auto-refreshed
if (properties.autoRefreshed()) {

String content = getContent(configService, dataId, groupId);

if (hasText(content)) {
doBind(bean, beanName, dataId, groupId, type, properties, content,
configService);
}

Listener listener = new AbstractListener() {
@Override
Expand All @@ -139,13 +146,6 @@ public void receiveConfigInfo(String config) {
}
}
}

String content = getContent(configService, dataId, groupId);

if (hasText(content)) {
doBind(bean, beanName, dataId, groupId, type, properties, content,
configService);
}
}

protected void doBind(Object bean, String beanName, String dataId, String groupId,
Expand Down
2 changes: 1 addition & 1 deletion nacos-spring-samples/nacos-embedded-webserver/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>nacos-spring-parent</artifactId>
<groupId>com.alibaba.nacos</groupId>
<version>1.1.0</version>
<version>1.1.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion nacos-spring-samples/nacos-spring-webmvc-sample/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>nacos-spring-samples</artifactId>
<groupId>com.alibaba.nacos</groupId>
<version>1.1.0</version>
<version>1.1.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion nacos-spring-samples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>nacos-spring-parent</artifactId>
<groupId>com.alibaba.nacos</groupId>
<version>1.1.0</version>
<version>1.1.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-spring-parent</artifactId>
<version>1.1.0</version>
<version>1.1.1</version>
<name>Alibaba Nacos :: Spring :: POM</name>
<packaging>pom</packaging>

Expand Down