Repository: logging-log4j2 Updated Branches: refs/heads/master c671e1699 -> c04d36767
Remove redundant private API. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/c04d3676 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c04d3676 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c04d3676 Branch: refs/heads/master Commit: c04d36767de3f9332cf6fba7887934c3ae980907 Parents: c671e16 Author: Gary Gregory <garydgreg...@gmail.com> Authored: Thu Jun 11 20:46:47 2015 -0700 Committer: Gary Gregory <garydgreg...@gmail.com> Committed: Thu Jun 11 20:46:47 2015 -0700 ---------------------------------------------------------------------- .../java/org/apache/logging/log4j/core/util/Loader.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c04d3676/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Loader.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Loader.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Loader.java index d9513fa..492a1ff 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Loader.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Loader.java @@ -64,7 +64,7 @@ public final class Loader { // TODO: this method could use some explanation public static ClassLoader getClassLoader(final Class<?> class1, final Class<?> class2) { - final ClassLoader threadContextClassLoader = getTccl(); + final ClassLoader threadContextClassLoader = getThreadContextClassLoader(); final ClassLoader loader1 = class1 == null ? null : class1.getClassLoader(); final ClassLoader loader2 = class2 == null ? null : class2.getClassLoader(); @@ -96,7 +96,7 @@ public final class Loader { */ public static URL getResource(final String resource, final ClassLoader defaultLoader) { try { - ClassLoader classLoader = getTccl(); + ClassLoader classLoader = getThreadContextClassLoader(); if (classLoader != null) { LOGGER.trace("Trying to find [{}] using context class loader {}.", resource, classLoader); final URL url = classLoader.getResource(resource); @@ -158,7 +158,7 @@ public final class Loader { */ public static InputStream getResourceAsStream(final String resource, final ClassLoader defaultLoader) { try { - ClassLoader classLoader = getTccl(); + ClassLoader classLoader = getThreadContextClassLoader(); InputStream is; if (classLoader != null) { LOGGER.trace("Trying to find [{}] using context class loader {}.", resource, classLoader); @@ -201,10 +201,6 @@ public final class Loader { return ClassLoader.getSystemResourceAsStream(resource); } - private static ClassLoader getTccl() { - return LoaderUtil.getThreadContextClassLoader(); - } - /** * Determines if one ClassLoader is a child of another ClassLoader. Note that a {@code null} ClassLoader is * interpreted as the system ClassLoader as per convention.
