Repository: logging-log4j2 Updated Branches: refs/heads/master 39e286881 -> 2741e01c9
Better lvar name than 'r'. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a42b95b1 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a42b95b1 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a42b95b1 Branch: refs/heads/master Commit: a42b95b180f0b02b7415e00e91dfab409b04abae Parents: 39e2868 Author: Gary Gregory <[email protected]> Authored: Mon Nov 17 21:44:56 2014 -0500 Committer: Gary Gregory <[email protected]> Committed: Mon Nov 17 21:44:56 2014 -0500 ---------------------------------------------------------------------- .../log4j/core/selector/ClassLoaderContextSelector.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a42b95b1/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/ClassLoaderContextSelector.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/ClassLoaderContextSelector.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/ClassLoaderContextSelector.java index 64860dd..dc15f9e 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/ClassLoaderContextSelector.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/ClassLoaderContextSelector.java @@ -150,8 +150,8 @@ public class ClassLoaderContextSelector implements ContextSelector { ctx = CONTEXT_MAP.get(name).get().get(); return ctx; } - final WeakReference<LoggerContext> r = ref.get(); - LoggerContext ctx = r.get(); + final WeakReference<LoggerContext> weakRef = ref.get(); + LoggerContext ctx = weakRef.get(); if (ctx != null) { if (ctx.getConfigLocation() == null && configLocation != null) { LOGGER.debug("Setting configuration to {}", configLocation); @@ -164,7 +164,7 @@ public class ClassLoaderContextSelector implements ContextSelector { return ctx; } ctx = new LoggerContext(name, null, configLocation); - ref.compareAndSet(r, new WeakReference<LoggerContext>(ctx)); + ref.compareAndSet(weakRef, new WeakReference<LoggerContext>(ctx)); return ctx; }
