fix:add warn log to ApplicationContextAwareUtils. (#1297)

pull/1310/head
Haotian Zhang 7 months ago committed by GitHub
parent cb5021f825
commit c4831aabf0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -11,3 +11,4 @@
- [fix:fix nearby router properties loading bug.](https://github.com/Tencent/spring-cloud-tencent/pull/1272) - [fix:fix nearby router properties loading bug.](https://github.com/Tencent/spring-cloud-tencent/pull/1272)
- [fix: fix grammar issues for lane router example & optimize the gateway dependency](https://github.com/Tencent/spring-cloud-tencent/pull/1274) - [fix: fix grammar issues for lane router example & optimize the gateway dependency](https://github.com/Tencent/spring-cloud-tencent/pull/1274)
- [fix: fix lossless deregister failed when no healthcheck configured](https://github.com/Tencent/spring-cloud-tencent/pull/1279) - [fix: fix lossless deregister failed when no healthcheck configured](https://github.com/Tencent/spring-cloud-tencent/pull/1279)
- [fix:fix ApplicationContextAwareUtils NPE bug.](https://github.com/Tencent/spring-cloud-tencent/pull/1297)

@ -17,6 +17,10 @@
package com.tencent.cloud.common.util; package com.tencent.cloud.common.util;
import com.tencent.polaris.api.utils.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware; import org.springframework.context.ApplicationContextAware;
@ -29,6 +33,8 @@ import org.springframework.lang.NonNull;
*/ */
public class ApplicationContextAwareUtils implements ApplicationContextAware { public class ApplicationContextAwareUtils implements ApplicationContextAware {
private static final Logger LOGGER = LoggerFactory.getLogger(ApplicationContextAwareUtils.class);
private static ApplicationContext applicationContext; private static ApplicationContext applicationContext;
/** /**
@ -50,7 +56,15 @@ public class ApplicationContextAwareUtils implements ApplicationContextAware {
* @return property value * @return property value
*/ */
public static String getProperties(String key) { public static String getProperties(String key) {
return applicationContext.getEnvironment().getProperty(key); if (applicationContext != null) {
return applicationContext.getEnvironment().getProperty(key);
}
LOGGER.warn("applicationContext is null, try to get property from System.getenv or System.getProperty");
String property = System.getenv(key);
if (StringUtils.isBlank(property)) {
property = System.getProperty(key);
}
return property;
} }
/** /**
@ -60,6 +74,14 @@ public class ApplicationContextAwareUtils implements ApplicationContextAware {
* @return property value * @return property value
*/ */
public static String getProperties(String key, String defaultValue) { public static String getProperties(String key, String defaultValue) {
return applicationContext.getEnvironment().getProperty(key, defaultValue); if (applicationContext != null) {
return applicationContext.getEnvironment().getProperty(key, defaultValue);
}
LOGGER.warn("applicationContext is null, try to get property from System.getenv or System.getProperty");
String property = System.getenv(key);
if (StringUtils.isBlank(property)) {
property = System.getProperty(key, defaultValue);
}
return property;
} }
} }

Loading…
Cancel
Save