[LOG4J2-1547] The Core AbstractConfiguration should track its LoggerContext and add Configuration.getLoggerContext(). Tie up loose end in CompositeConfiguration.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/da5d6f33 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/da5d6f33 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/da5d6f33 Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure Commit: da5d6f33129146ac403df7bcab4c6e0c98095c46 Parents: 095a4bd Author: Gary Gregory <ggreg...@apache.org> Authored: Thu Aug 25 22:24:12 2016 -0700 Committer: Gary Gregory <ggreg...@apache.org> Committed: Thu Aug 25 22:24:12 2016 -0700 ---------------------------------------------------------------------- .../log4j/core/config/composite/CompositeConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/da5d6f33/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 a1f1557..fa941d7 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 @@ -62,7 +62,7 @@ public class CompositeConfiguration extends AbstractConfiguration implements Rec * @param configurations The List of Configurations to merge. */ public CompositeConfiguration(final List<? extends AbstractConfiguration> configurations) { - super(null, ConfigurationSource.NULL_SOURCE); + super(configurations.get(0).getLoggerContext(), ConfigurationSource.NULL_SOURCE); rootNode = configurations.get(0).getRootNode(); this.configurations = configurations; final String mergeStrategyClassName = PropertiesUtil.getProperties().getStringProperty(MERGE_STRATEGY_PROPERTY,
