Repository: logging-log4j2 Updated Branches: refs/heads/release-2.x 76bf4df50 -> 1d70d3197
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/b7c815e8 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b7c815e8 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b7c815e8 Branch: refs/heads/release-2.x Commit: b7c815e8c53dfac447f5ee1c523c68563c76cd82 Parents: 76bf4df Author: Ralph Goers <rgo...@apache.org> Authored: Sun Mar 11 12:34:58 2018 -0700 Committer: Ralph Goers <rgo...@apache.org> Committed: Sun Mar 11 12:34:58 2018 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/logging/log4j/util/LoaderUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b7c815e8/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());
