Fix NPE in MDCContextMap #430
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
Accomodate for the fact that MDC.getCopyOfContextMap() may return null
carterkozak
reviewed
Oct 5, 2020
LOG4J2-2939;
|
Thanks! I'll handle the merge and cherry-pick to relevant release branches. |
|
Thank you very much! |
garydgregory
reviewed
Oct 5, 2020
| assertNull("Setup wrong", MDC.getCopyOfContextMap()); | ||
| assertTrue(ThreadContext.isEmpty()); | ||
| assertFalse(ThreadContext.containsKey("something")); | ||
| } |
There was a problem hiding this comment.
I would separate these into two tests, one for each API.
There was a problem hiding this comment.
An edge case worth testing IMO is getting a null key.
There was a problem hiding this comment.
Thank you for the feedback! I split the tests and added some tests concerning null keys.
LOG4J2-2939;
carterkozak
pushed a commit
that referenced
this pull request
Oct 6, 2020
Accomodate for the fact that MDC.getCopyOfContextMap() may return null
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
PR for https://issues.apache.org/jira/browse/LOG4J2-2939
Accomodate for the fact that MDC.getCopyOfContextMap() may return null.