bugfix: fix the NPE and reduce the request when lockkey is null #2495
Conversation
This file contains 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
slievrly
reviewed
Apr 3, 2020
|
|
||
| checkLock(context.buildLockKeys()); | ||
| Set<String> lockKeys = context.getLockKeysBuffer(); | ||
| if (CollectionUtils.isNotEmpty(lockKeys)) { |
There was a problem hiding this comment.
Is it more appropriate to put logic with lockkey as empty in the checkLock method?
There was a problem hiding this comment.
ok,i will change
Codecov Report
@@ Coverage Diff @@
## develop #2495 +/- ##
=============================================
- Coverage 51.45% 51.42% -0.03%
+ Complexity 2666 2664 -2
=============================================
Files 529 529
Lines 16956 16964 +8
Branches 2051 2052 +1
=============================================
Hits 8724 8724
- Misses 7408 7412 +4
- Partials 824 828 +4
|
slievrly
changed the title
slievrly
changed the title
zjinlei
reviewed
Apr 4, 2020
| @@ -153,6 +153,9 @@ protected Locker getLocker() { | |||
| Long branchID) { | |||
| List<RowLock> locks = new ArrayList<RowLock>(); | |||
|
|
|||
| if (StringUtils.isEmpty(lockKey)) { | |||
| return null; | |||
| } | |||
l81893521
reviewed
Apr 7, 2020
| @@ -153,6 +153,9 @@ protected Locker getLocker() { | |||
| Long branchID) { | |||
| List<RowLock> locks = new ArrayList<RowLock>(); | |||
|
|
|||
| if (StringUtils.isEmpty(lockKey)) { | |||
There was a problem hiding this comment.
That s ok. And I think can remove the code
if (StringUtils.isNullOrEmpty(lockKey)) {
// no lock
return true;
}
at
acquireLock(BranchSession branchSession)
wangliang181230
added
type: bug
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.
Ⅰ. Describe what this PR did
1.fix: Fix the NPE when lockkey is null;
2.optimize: Reduce once db request when lockkey is null;
Ⅱ. Does this pull request fix one issue?
yes.
issue
Ⅲ. Why don't you add test cases (unit test/integration test)?
Ⅳ. Describe how to verify it
Ⅴ. Special notes for reviews