You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2014/11/04 22:13:05 UTC
git commit: Don't hide field with config lvar name.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 261273e9b -> 1b0f4f91a
Don't hide field with config lvar name.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/1b0f4f91
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/1b0f4f91
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/1b0f4f91
Branch: refs/heads/master
Commit: 1b0f4f91a5acf9ab980fb3fcc0b9838951fd96a9
Parents: 261273e
Author: Gary Gregory <ga...@gmail.com>
Authored: Tue Nov 4 16:12:12 2014 -0500
Committer: Gary Gregory <ga...@gmail.com>
Committed: Tue Nov 4 16:12:12 2014 -0500
----------------------------------------------------------------------
.../main/java/org/apache/logging/log4j/core/LoggerContext.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1b0f4f91/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
index 4a642d6..140317e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
@@ -453,9 +453,9 @@ public class LoggerContext extends AbstractLifeCycle implements org.apache.loggi
@Override
public synchronized void onChange(final Reconfigurable reconfigurable) {
LOGGER.debug("Reconfiguration started for context {} ({})", name, this);
- final Configuration config = reconfigurable.reconfigure();
- if (config != null) {
- setConfiguration(config);
+ final Configuration newConfig = reconfigurable.reconfigure();
+ if (newConfig != null) {
+ setConfiguration(newConfig);
LOGGER.debug("Reconfiguration completed for {} ({})", name, this);
} else {
LOGGER.debug("Reconfiguration failed for {} ({})", name, this);