LOG4J2-2754: LoaderUtil.getClassLoaders may discover additional loaders #328
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
The utility no longer erroneously returns a result with a null element in some environments. Also updated loadClass to avoid internally throwing and catching a null pointer exception when getThreadContextClassLoader returns null.
carterkozak
commented
Dec 31, 2019
| classLoaders.add(current); | ||
| final ClassLoader parent = current.getParent(); | ||
| while (parent != null && !classLoaders.contains(parent)) { | ||
| classLoaders.add(parent); |
There was a problem hiding this comment.
This loop failed to modify the condition
carterkozak
commented
Dec 31, 2019
| @@ -106,30 +104,31 @@ public ClassLoader run() { | |||
| } | |||
|
|
|||
| public static ClassLoader[] getClassLoaders() { | |||
| final List<ClassLoader> classLoaders = new ArrayList<>(); | |||
| final Collection<ClassLoader> classLoaders = new LinkedHashSet<>(); | |||
There was a problem hiding this comment.
LinkedHashSet is more expensive in environments with few values, but performs better in the worst case without sacrificing order.
|
@rgoers I'm not as familiar with the consumers of |
rgoers
approved these changes
Dec 31, 2019
|
Thanks Ralph, tests all pass, I've merged this commit. It's not a clean cherry-pick to master because fbde9cd was not applied to release-2.x. |
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.
The utility no longer erroneously returns a result with a null element in some
environments.
Also updated loadClass to avoid internally throwing and catching a null
pointer exception when getThreadContextClassLoader returns null.