fix:fix PolarisContextProperties instantiated twice causing NPE.

2.0.2.1-2024.0.1
Haotian Zhang 2 months ago
parent b57fc372ef
commit 50201b38c9

@ -12,3 +12,4 @@
- [feat:support instance detect.](https://github.com/Tencent/spring-cloud-tencent/pull/1620) - [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) - [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) - [feat:support polaris server nearby backup LB.](https://github.com/Tencent/spring-cloud-tencent/pull/1631)
- fix:fix PolarisContextProperties instantiated twice causing NPE.

@ -90,7 +90,7 @@
<properties> <properties>
<!-- Project revision --> <!-- Project revision -->
<revision>2.0.2.0-2024.0.1</revision> <revision>2.0.2.1-2024.0.1</revision>
<!-- Spring Framework --> <!-- Spring Framework -->
<spring.framework.version>6.2.7</spring.framework.version> <spring.framework.version>6.2.7</spring.framework.version>

@ -71,7 +71,7 @@
<properties> <properties>
<!-- Project revision --> <!-- Project revision -->
<revision>2.0.2.0-2024.0.1</revision> <revision>2.0.2.1-2024.0.1</revision>
<!-- Polaris SDK version --> <!-- Polaris SDK version -->
<polaris.version>2.0.2.0</polaris.version> <polaris.version>2.0.2.0</polaris.version>

@ -46,9 +46,15 @@ import org.springframework.core.env.Environment;
* @author Haotian Zhang * @author Haotian Zhang
*/ */
@ConditionalOnPolarisEnabled @ConditionalOnPolarisEnabled
@EnableConfigurationProperties({PolarisContextProperties.class}) @EnableConfigurationProperties
public class PolarisContextAutoConfiguration { public class PolarisContextAutoConfiguration {
@Bean
@ConditionalOnMissingBean
public PolarisContextProperties polarisContextProperties() {
return new PolarisContextProperties();
}
@Bean(initMethod = "init") @Bean(initMethod = "init")
@ConditionalOnMissingBean @ConditionalOnMissingBean
public PolarisSDKContextManager polarisSDKContextManager(PolarisContextProperties properties, Environment environment, List<PolarisConfigModifier> modifierList) throws PolarisException { public PolarisSDKContextManager polarisSDKContextManager(PolarisContextProperties properties, Environment environment, List<PolarisConfigModifier> modifierList) throws PolarisException {

@ -68,7 +68,7 @@ public class PolarisContextProperties {
/** /**
* current server local port. * current server local port.
*/ */
@Value("${spring.cloud.polaris.localPort:}") @Value("${spring.cloud.polaris.localPort:0}")
private Integer localPort; private Integer localPort;
/** /**

Loading…
Cancel
Save