Repository: logging-log4j2 Updated Branches: refs/heads/master 52fd4fdf4 -> 03dd7d08f
Minor formatting. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/03dd7d08 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/03dd7d08 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/03dd7d08 Branch: refs/heads/master Commit: 03dd7d08fb5b70a6be5887f09ef7f99090eea714 Parents: 52fd4fd Author: Gary Gregory <[email protected]> Authored: Mon Jan 8 18:00:31 2018 -0700 Committer: Gary Gregory <[email protected]> Committed: Mon Jan 8 18:00:31 2018 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/logging/log4j/util/LoaderUtil.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/03dd7d08/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 6f73044..7626704 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 @@ -276,8 +276,12 @@ public final class LoaderUtil { } static Collection<UrlResource> findUrlResources(final String resource) { - final ClassLoader[] candidates = {getThreadContextClassLoader(), LoaderUtil.class.getClassLoader(), + // @formatter:off + final ClassLoader[] candidates = { + getThreadContextClassLoader(), + LoaderUtil.class.getClassLoader(), GET_CLASS_LOADER_DISABLED ? null : ClassLoader.getSystemClassLoader()}; + // @formatter:on final Collection<UrlResource> resources = new LinkedHashSet<>(); for (final ClassLoader cl : candidates) { if (cl != null) {
