From 3cb0c07121c5e6f216a425c5cdd4651d0e037fc1 Mon Sep 17 00:00:00 2001
From: Haotian Zhang <928016560@qq.com>
Date: Tue, 15 Jul 2025 17:13:24 +0800
Subject: [PATCH] fix:fix polaris_namespace is null when using TSF.

---
 .../extend/tsf/TsfCoreEnvironmentPostProcessor.java | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/config/extend/tsf/TsfCoreEnvironmentPostProcessor.java b/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/config/extend/tsf/TsfCoreEnvironmentPostProcessor.java
index 90b5b9531..75a609102 100644
--- a/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/config/extend/tsf/TsfCoreEnvironmentPostProcessor.java
+++ b/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/config/extend/tsf/TsfCoreEnvironmentPostProcessor.java
@@ -119,16 +119,9 @@ public final class TsfCoreEnvironmentPostProcessor implements EnvironmentPostPro
 				if (StringUtils.isBlank(tsfNamespaceId)) {
 					LOGGER.error("tsf_namespace_id is empty");
 				}
-				else {
-					String polarisAddress = environment.getProperty("polaris_address");
-					if (StringUtils.isBlank(polarisAddress) && StringUtils.isNotBlank(environment.getProperty("spring.cloud.polaris.address"))) {
-						polarisAddress = environment.getProperty("spring.cloud.polaris.address");
-					}
-					// set tsf_namespace_id as polaris namespace only tsf consul enabled
-					if (StringUtils.isNotBlank(tsfConsulIp) && StringUtils.isBlank(polarisAddress) &&
-							StringUtils.isBlank(environment.getProperty("spring.cloud.polaris.namespace"))) {
-						defaultProperties.put("spring.cloud.polaris.namespace", tsfNamespaceId);
-					}
+				String polarisNamespace = environment.getProperty("polaris_namespace");
+				if (StringUtils.isBlank(polarisNamespace) && StringUtils.isNotBlank(tsfNamespaceId)) {
+					defaultProperties.put("spring.cloud.polaris.namespace", tsfNamespaceId);
 				}
 
 				// context