Repository: logging-log4j2 Updated Branches: refs/heads/master fd3a82bff -> 9ed183774
LOG4J2-2104 - LoaderUtil was improperly looping over classloaders Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/9ed18377 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/9ed18377 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/9ed18377 Branch: refs/heads/master Commit: 9ed183774830b53927e871e303272276cb835603 Parents: fd3a82b Author: Ralph Goers <rgo...@apache.org> Authored: Sun Mar 11 12:36:03 2018 -0700 Committer: Ralph Goers <rgo...@apache.org> Committed: Sun Mar 11 12:36:03 2018 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/logging/log4j/util/LoaderUtil.java | 3 ++- src/changes/changes.xml | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9ed18377/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java index 7626704..2a153b1 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java @@ -117,9 +117,10 @@ public final class LoaderUtil { classLoaders.add(parent); } } - ClassLoader parent = tcl; + ClassLoader parent = tcl.getParent(); while (parent != null && !classLoaders.contains(parent)) { classLoaders.add(parent); + parent = parent.getParent(); } if (!classLoaders.contains(ClassLoader.getSystemClassLoader())) { classLoaders.add(ClassLoader.getSystemClassLoader()); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9ed18377/src/changes/changes.xml ---------------------------------------------------------------------- diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 49c8d90..554ba35 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -102,6 +102,9 @@ </action> </release> <release version="2.11.0" date="2018-xx-xx" description="GA Release 2.11.0"> + <action issue="LOG4J2-2104" dev="rgoers" type="fix"> + LoaderUtil was not looping properly over classloaders. + </action> <action issue="LOG4J2-2273" dev="rpopma" type="update" due-to="Bruno P. Kinoshita"> Documentation fix in manual page for custom configurations. </action>
