Repository: logging-log4j2 Updated Branches: refs/heads/release-2.x fef702689 -> c491570c3
Javadoc. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/c491570c Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c491570c Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c491570c Branch: refs/heads/release-2.x Commit: c491570c3b060898c6a9ff40ae52295d32df9d2f Parents: fef7026 Author: Gary Gregory <ggreg...@rocketsoftware.com> Authored: Tue Oct 16 11:55:00 2018 -0600 Committer: Gary Gregory <ggreg...@rocketsoftware.com> Committed: Tue Oct 16 11:55:00 2018 -0600 ---------------------------------------------------------------------- .../apache/logging/log4j/core/LoggerContext.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c491570c/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 a29eda8..2a9343c 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 @@ -490,14 +490,15 @@ public class LoggerContext extends AbstractLifeCycle return loggerRegistry.hasLogger(name, messageFactoryClass); } - /** - * Returns the current Configuration. The Configuration will be replaced when a reconfigure occurs. - * - * @return The Configuration. - */ - public Configuration getConfiguration() { - return configuration; - } + /** + * Returns the current Configuration. The Configuration will be replaced when a reconfigure occurs. + * + * @return The current Configuration, never {@code null}, but may be + * {@link org.apache.logging.log4j.core.config.NullConfiguration}. + */ + public Configuration getConfiguration() { + return configuration; + } /** * Adds a Filter to the Configuration. Filters that are added through the API will be lost when a reconfigure
