Fix key removal issues in Thread Context #3050
Merged
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
jengebr
reviewed
Oct 2, 2024
log4j-api/src/main/java/org/apache/logging/log4j/internal/map/UnmodifiableArrayBackedMap.java
Outdated
Show resolved
Hide resolved
log4j-api/src/main/java/org/apache/logging/log4j/internal/map/UnmodifiableArrayBackedMap.java
Show resolved
Hide resolved
jengebr
approved these changes
Oct 2, 2024
ppkarwasz
requested changes
Oct 7, 2024
There was a problem hiding this comment.
LGTM, 💯
There is certainly a bug in copyAndRemoveAll implementation (although I don't seem to be able to pinpoint it), but the user-supplied test cases trigger it by using the ThreadContext API incorrectly (IMHO).
Can we trigger the bug with a different unit test?
log4j-api-test/src/test/java/org/apache/logging/log4j/CloseableThreadContextTest.java
Outdated
Show resolved
Hide resolved
log4j-api-test/src/test/java/org/apache/logging/log4j/CloseableThreadContextTest.java
Outdated
Show resolved
Hide resolved
log4j-api/src/main/java/org/apache/logging/log4j/internal/map/UnmodifiableArrayBackedMap.java
Show resolved
Hide resolved
log4j-api-test/src/test/java/org/apache/logging/log4j/CloseableThreadContextTest.java
Outdated
Show resolved
Hide resolved
Co-authored-by: Piotr P. Karwasz <piotr.github@karwasz.org>
Co-authored-by: Piotr P. Karwasz <piotr.github@karwasz.org>
ppkarwasz
approved these changes
Oct 10, 2024
ppkarwasz
added a commit
that referenced
this pull request
Nov 15, 2024
Co-authored-by: Piotr P. Karwasz <piotr.github@karwasz.org>
ppkarwasz
added a commit
that referenced
this pull request
Nov 18, 2024
This backports #3050 to the 2.24.x branch. Co-authored-by: Volkan Yazıcı <volkan@yazi.ci>
ppkarwasz
added a commit
that referenced
this pull request
Nov 21, 2024
This backports #3050 to the 2.24.x branch. Co-authored-by: Volkan Yazıcı <volkan@yazi.ci>
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.
Fixes #2946.