fix:fix PolarisContextProperties instantiated twice causing NPE. (#1640)

Co-authored-by: Haotian Zhang <skyebefreeman@qq.com>
pull/1655/head
Fishtail 2 months ago committed by GitHub
parent b39ec51aba
commit 477324c15a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -1,3 +1,4 @@
# Change Log
---
- [fix:fix PolarisContextProperties instantiated twice causing NPE.](https://github.com/Tencent/spring-cloud-tencent/pull/1640)

@ -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<PolarisConfigModifier> modifierList) throws PolarisException {

@ -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;
/**

Loading…
Cancel
Save