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

pull/1642/head
Haotian Zhang 2 months ago committed by fishtailfu
parent 809d369dad
commit c90993d5bf

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

@ -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