fix TemplateUtils usage (alibaba#5010)

harday · Mar 5, 2021 · 63f7e33 · 63f7e33
1 parent 96de278
commit 63f7e33
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/client/src/main/java/com/alibaba/nacos/client/utils/ParamUtil.java b/client/src/main/java/com/alibaba/nacos/client/utils/ParamUtil.java
@@ -164,12 +164,7 @@ public static String parseNamespace(Properties properties) {
                         String.valueOf(Constants.DEFAULT_USE_CLOUD_NAMESPACE_PARSING)));
 
         if (Boolean.parseBoolean(isUseCloudNamespaceParsing)) {
-            namespaceTmp = TemplateUtils.stringBlankAndThenExecute(namespaceTmp, new Callable<String>() {
-                @Override
-                public String call() {
-                    return TenantUtil.getUserTenantForAcm();
-                }
-            });
+            namespaceTmp = TenantUtil.getUserTenantForAcm();
 
             namespaceTmp = TemplateUtils.stringBlankAndThenExecute(namespaceTmp, new Callable<String>() {
                 @Override

diff --git a/client/src/main/java/com/alibaba/nacos/client/utils/TemplateUtils.java b/client/src/main/java/com/alibaba/nacos/client/utils/TemplateUtils.java
@@ -64,7 +64,7 @@ public static String stringEmptyAndThenExecute(String source, Callable<String> c
             }
         }
 
-        return source.trim();
+        return source == null ? null : source.trim();
     }
 
     /**
@@ -85,6 +85,6 @@ public static String stringBlankAndThenExecute(String source, Callable<String> c
             }
         }
 
-        return source.trim();
+        return source == null ? null : source.trim();
     }
 }