diff --git a/CHANGELOG.md b/CHANGELOG.md index efab3a043..7011ec8bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,3 +12,4 @@ - [feat:support instance detect.](https://github.com/Tencent/spring-cloud-tencent/pull/1620) - [fix: fix loadbalancer metadata type.](https://github.com/Tencent/spring-cloud-tencent/pull/1622) - [feat:support polaris server nearby backup LB.](https://github.com/Tencent/spring-cloud-tencent/pull/1631) +- fix:fix PolarisContextProperties instantiated twice causing NPE. diff --git a/pom.xml b/pom.xml index 73594fb54..69c63395a 100644 --- a/pom.xml +++ b/pom.xml @@ -90,7 +90,7 @@ - 2.0.2.0-2024.0.1 + 2.0.2.1-2024.0.1 6.2.7 diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml index 192787ab7..5e2c244c0 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -71,7 +71,7 @@ - 2.0.2.0-2024.0.1 + 2.0.2.1-2024.0.1 2.0.2.0 diff --git a/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/config/PolarisContextAutoConfiguration.java b/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/config/PolarisContextAutoConfiguration.java index 5a9e63031..9c8bd38ae 100644 --- a/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/config/PolarisContextAutoConfiguration.java +++ b/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/config/PolarisContextAutoConfiguration.java @@ -46,9 +46,15 @@ import org.springframework.core.env.Environment; * @author Haotian Zhang */ @ConditionalOnPolarisEnabled -@EnableConfigurationProperties({PolarisContextProperties.class}) +@EnableConfigurationProperties public class PolarisContextAutoConfiguration { + @Bean + @ConditionalOnMissingBean + public PolarisContextProperties polarisContextProperties() { + return new PolarisContextProperties(); + } + @Bean(initMethod = "init") @ConditionalOnMissingBean public PolarisSDKContextManager polarisSDKContextManager(PolarisContextProperties properties, Environment environment, List modifierList) throws PolarisException { diff --git a/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/config/PolarisContextProperties.java b/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/config/PolarisContextProperties.java index 84db65234..25f5a891a 100644 --- a/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/config/PolarisContextProperties.java +++ b/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/config/PolarisContextProperties.java @@ -68,7 +68,7 @@ public class PolarisContextProperties { /** * current server local port. */ - @Value("${spring.cloud.polaris.localPort:}") + @Value("${spring.cloud.polaris.localPort:0}") private Integer localPort; /**