fix the problem of potential NPE in ACL plain #2893
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
panzhi33
approved these changes
May 14, 2021
vongosling
reviewed
May 19, 2021
| private String fileName = System.getProperty("rocketmq.acl.plain.file", DEFAULT_PLAIN_ACL_FILE); | ||
|
|
||
| private Map<String/** AccessKey **/, PlainAccessResource> plainAccessResourceMap = new HashMap<>(); | ||
| private Map<String/** AccessKey **/, PlainAccessResource> plainAccessResourceMap = new HashMap<>(); |
| JSONObject.class); | ||
| if (plainAclConfData == null || plainAclConfData.isEmpty()) { | ||
| throw new AclException(String.format("%s file is not data", fileHome + File.separator + fileName)); | ||
| throw new AclException(String.format("%s file is not data", fileHome + File.separator + fileName)); |
There was a problem hiding this comment.
the middle of file and is has two blanks, right?
| Map.class); | ||
|
|
||
| if (aclAccessConfigMap == null || aclAccessConfigMap.isEmpty()) { | ||
| throw new AclException(String.format("%s file is not data", fileHome + File.separator + fileName)); |
There was a problem hiding this comment.
what is file is not data, is it right sematic?
added 6 commits
May 20, 2021 14:03
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## develop #2893 +/- ##
=============================================
+ Coverage 46.67% 47.86% +1.19%
- Complexity 4418 4538 +120
=============================================
Files 552 552
Lines 36500 36524 +24
Branches 4828 4834 +6
=============================================
+ Hits 17035 17481 +446
+ Misses 17344 16817 -527
- Partials 2121 2226 +105 ☔ View full report in Codecov by Sentry. |
duhenglucky
reviewed
May 21, 2021
|
|
||
| Map<String, Object> newAccountsMap = null; | ||
| if (existedAccountMap == null) { | ||
| if (existedAccoutMap == null) { |
ShannonDing
reviewed
May 21, 2021
| Map.class); | ||
|
|
||
| if (aclAccessConfigMap == null || aclAccessConfigMap.isEmpty()) { | ||
| throw new AclException(String.format("%s file not found or empty", fileHome + File.separator + fileName)); |
There was a problem hiding this comment.
"the xxx file is not found or empty " seems better.
duhenglucky
approved these changes
May 23, 2021
GenerousMan
pushed a commit
to GenerousMan/rocketmq
that referenced
this pull request
Aug 12, 2022
fix the problem of potential NPE in ACL plain
pulllock
pushed a commit
to pulllock/rocketmq
that referenced
this pull request
Oct 19, 2023
fix the problem of potential NPE in ACL plain
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
[#2863] fix the problem of potential NPE in ACL plain and revise codeStyle