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 2015/09/08 19:54:03 UTC

logging-log4j2 git commit: Better Javadocs.

Repository: logging-log4j2
Updated Branches:
  refs/heads/master 77532cb94 -> ce1668592


Better Javadocs.

Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ce166859
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ce166859
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ce166859

Branch: refs/heads/master
Commit: ce166859290c5f3e92211b439883e4dd26235a71
Parents: 77532cb
Author: ggregory <gg...@apache.org>
Authored: Tue Sep 8 10:54:01 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Tue Sep 8 10:54:01 2015 -0700

----------------------------------------------------------------------
 .../org/apache/logging/log4j/core/config/Configurator.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce166859/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Configurator.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Configurator.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Configurator.java
index bb2c3ec..7b138b1 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Configurator.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Configurator.java
@@ -93,7 +93,7 @@ public final class Configurator {
      * @param name The Context name.
      * @param loader The ClassLoader for the Context (or null).
      * @param configLocation The configuration for the logging context.
-     * @return The LoggerContext.
+     * @return The LoggerContext or null if an error occurred (check the status logger).
      */
     public static LoggerContext initialize(final String name, final ClassLoader loader, final String configLocation) {
         return initialize(name, loader, configLocation, null);
@@ -106,7 +106,7 @@ public final class Configurator {
      * @param loader The ClassLoader for the Context (or null).
      * @param configLocation The configuration for the logging context.
      * @param externalContext The external context to be attached to the LoggerContext
-     * @return The LoggerContext.
+     * @return The LoggerContext or null if an error occurred (check the status logger).
      */
     public static LoggerContext initialize(final String name, final ClassLoader loader, final String configLocation,
                                            final Object externalContext) {
@@ -157,7 +157,7 @@ public final class Configurator {
      * Initializes the Logging Context.
      * @param name The Context name.
      * @param configLocation The configuration for the logging context.
-     * @return The LoggerContext.
+     * @return The LoggerContext or null if an error occurred (check the status logger).
      */
     public static LoggerContext initialize(final String name, final String configLocation) {
         return initialize(name, null, configLocation);