fix:fix ApplicationContextAwareUtils NPE bug. (#1293)

Tencent · May 15, 2024 · f625e1d · f625e1d
1 parent 8159888
commit f625e1d
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,3 +12,4 @@
 - [refactor:let the configuration SDK context stand alone.](https://github.com/Tencent/spring-cloud-tencent/pull/1275)
 - [fix: fix grammar issues for lane router example & optimize the gateway dependency](https://github.com/Tencent/spring-cloud-tencent/pull/1276)
 - [fix: fix lossless deregister failed when no healthcheck configured](https://github.com/Tencent/spring-cloud-tencent/pull/1281)
+- [fix:fix ApplicationContextAwareUtils NPE bug.](https://github.com/Tencent/spring-cloud-tencent/pull/1293)
diff --git a/...ent-commons/src/main/java/com/tencent/cloud/common/util/ApplicationContextAwareUtils.java b/...ent-commons/src/main/java/com/tencent/cloud/common/util/ApplicationContextAwareUtils.java
@@ -17,6 +17,10 @@
 
 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.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
@@ -29,6 +33,8 @@
  */
 public class ApplicationContextAwareUtils implements ApplicationContextAware {
 
+	private static final Logger LOGGER = LoggerFactory.getLogger(ApplicationContextAwareUtils.class);
+
 	private static ApplicationContext applicationContext;
 
 	/**
@@ -50,7 +56,15 @@ public void setApplicationContext(@NonNull ApplicationContext applicationContext
 	 * @return property value
 	 */
 	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 static String getProperties(String key) {
 	 * @return property value
 	 */
 	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;
 	}
 }