New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix TemplateUtils usage #5010

Merged

KomachiSion merged 1 commit into alibaba:develop from shalk:fix-1

Mar 5, 2021

Contributor

shalk commented Mar 4, 2021

Please do not create a Pull Request without creating an issue first.

What is the purpose of the change

fix source.trim() if source is null
call TenantUtil.getUserTenantForAcm() directly when namespaceTmp is null

Brief changelog

XX

Verifying this change

XXXX

Follow this checklist to help us incorporate your contribution quickly and easily:

Make sure there is a Github issue filed for the change (usually before you start working on it). Trivial changes like typos do not require a Github issue. Your pull request should address just this issue, without pulling in other changes - one PR resolves one issue.
Format the pull request title like [ISSUE #123] Fix UnknownException when host config not exist. Each commit in the pull request should have a meaningful subject line and body.
Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
Write necessary unit-test to verify your logic correction, more mock a little better when cross module dependency exist. If the new feature or significant change is committed, please remember to add integration-test in test module.
Run mvn -B clean package apache-rat:check findbugs:findbugs -Dmaven.test.skip=true to make sure basic checks pass. Run mvn clean install -DskipITs to make sure unit-test pass. Run mvn clean test-compile failsafe:integration-test to make sure integration-test pass.


          fix TemplateUtils usage

3b663bd

KomachiSion reviewed

View reviewed changes

Collaborator

KomachiSion left a comment

I think this PR is no meaningful,

Reason is TemplateUtils.java will use isBlank and isEmpty to check source fist, if source is null, source.trim will not be called.

client/src/main/java/com/alibaba/nacos/client/utils/ParamUtil.java

-                                  return TenantUtil.getUserTenantForAcm();
-                              }
-                          });
+                          namespaceTmp = TenantUtil.getUserTenantForAcm();

Collaborator

KomachiSion Mar 4, 2021

Why change this code?

Contributor Author

shalk Mar 4, 2021

line 160 String namespaceTmp = null , namespace is null here, stringBlankAndThenExecute is redundant

Contributor Author

shalk Mar 4, 2021

line 160 String namespaceTmp = null , namespace is null here, stringBlankAndThenExecute is redundant

KomachiSion added the status/invalid label

Contributor Author

shalk commented Mar 4, 2021

isBlank

I think this PR is no meaningful,

Reason is TemplateUtils.java will use isBlank and isEmpty to check source fist, if source is null, source.trim will not be called.

When callable.call throw exception and source is null , npe will be throw.

shalk requested a review from KomachiSion

March 4, 2021 11:07

Collaborator

KomachiSion commented Mar 5, 2021

OK.

KomachiSion added kind/enhancement and removed status/invalid labels

KomachiSion added this to the 1.4.2 milestone

KomachiSion approved these changes

View reviewed changes

KomachiSion merged commit 63f7e33 into alibaba:develop

shalk deleted the fix-1 branch

March 6, 2021 04:49

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment