Repository: logging-log4j2 Updated Branches: refs/heads/master 0d6278823 -> d647c0b1a
[LOG4J2-2036] CompositeConfiguration supports Reconfiguration. Full build with 'mvn clean install' OK. This closes #115. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/d647c0b1 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d647c0b1 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d647c0b1 Branch: refs/heads/master Commit: d647c0b1ac0bdee60f392083bd523a83d765e47e Parents: 0d62788 Author: Gary Gregory <[email protected]> Authored: Wed Oct 11 16:00:21 2017 -0600 Committer: Gary Gregory <[email protected]> Committed: Wed Oct 11 16:00:21 2017 -0600 ---------------------------------------------------------------------- .../log4j/core/config/composite/CompositeConfiguration.java | 6 ++---- src/changes/changes.xml | 3 +++ 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d647c0b1/log4j-core/src/main/java/org/apache/logging/log4j/core/config/composite/CompositeConfiguration.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/composite/CompositeConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/composite/CompositeConfiguration.java index 3fe20e9..ce8a8a7 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/composite/CompositeConfiguration.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/composite/CompositeConfiguration.java @@ -150,17 +150,15 @@ public class CompositeConfiguration extends AbstractConfiguration implements Rec for (final AbstractConfiguration config : configurations) { final ConfigurationSource source = config.getConfigurationSource(); final URI sourceURI = source.getURI(); - Configuration currentConfig; + Configuration currentConfig = config; if (sourceURI == null) { LOGGER.warn("Unable to determine URI for configuration {}, changes to it will be ignored", config.getName()); + } else { currentConfig = factory.getConfiguration(getLoggerContext(), config.getName(), sourceURI); if (currentConfig == null) { LOGGER.warn("Unable to reload configuration {}, changes to it will be ignored", config.getName()); - currentConfig = config; } - } else { - currentConfig = config; } configs.add((AbstractConfiguration) currentConfig); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d647c0b1/src/changes/changes.xml ---------------------------------------------------------------------- diff --git a/src/changes/changes.xml b/src/changes/changes.xml index a7438c0..c7b824f 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -68,6 +68,9 @@ <action issue="LOG4J2-2070" dev="ggregory" type="fix" due-to="Doug Hughes"> Log4j1XmlLayout does not provide the entire stack trace, it is missing the caused by information. </action> + <action issue="LOG4J2-2036" dev="ggregory" type="fix" due-to="Robert Haycock"> + CompositeConfiguration supports Reconfiguration. PR #115. + </action> </release> <release version="2.9.1" date="2017-09-17" description="GA Release 2.9.1"> <action issue="LOG4J2-1988" dev="rpopma" type="fix">
