fix:fix ApplicationContextAwareUtils NPE bug. (#1294)

pull/1308/head
Haotian Zhang 1 year ago committed by GitHub
parent b977be5511
commit bf4e42fc66
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -2,3 +2,4 @@
--- ---
- [feat:upgrade jackson version.](https://github.com/Tencent/spring-cloud-tencent/pull/1259) - [feat:upgrade jackson version.](https://github.com/Tencent/spring-cloud-tencent/pull/1259)
- [fix:fix ApplicationContextAwareUtils NPE bug.](https://github.com/Tencent/spring-cloud-tencent/pull/1294)

@ -17,6 +17,8 @@
package com.tencent.cloud.common.util; package com.tencent.cloud.common.util;
import com.tencent.polaris.api.utils.StringUtils;
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;
@ -50,7 +52,14 @@ 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);
}
String property = System.getenv(key);
if (StringUtils.isBlank(property)) {
property = System.getProperty(key);
}
return property;
} }
/** /**
@ -60,6 +69,13 @@ 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);
}
String property = System.getenv(key);
if (StringUtils.isBlank(property)) {
property = System.getProperty(key, defaultValue);
}
return property;
} }
} }

Loading…
Cancel
Save