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/05/20 19:15:58 UTC

svn commit: r1596321 - in /logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core: AbstractLifeCycle.java LoggerContext.java

Author: ggregory
Date: Tue May 20 17:15:58 2014
New Revision: 1596321

URL: http://svn.apache.org/r1596321
Log:
Move LOGGER static up to super class.

Modified:
    logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLifeCycle.java
    logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLifeCycle.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLifeCycle.java?rev=1596321&r1=1596320&r2=1596321&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLifeCycle.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLifeCycle.java Tue May 20 17:15:58 2014
@@ -16,6 +16,8 @@
  */
 package org.apache.logging.log4j.core;
 
+import org.apache.logging.log4j.status.StatusLogger;
+
 /**
  * A life cycle to be extended.
  * <p>
@@ -24,6 +26,8 @@ package org.apache.logging.log4j.core;
  */
 public class AbstractLifeCycle implements LifeCycle {
 
+    protected static final org.apache.logging.log4j.Logger LOGGER = StatusLogger.getLogger();
+    
     private volatile LifeCycle.State state = LifeCycle.State.INITIALIZED;
 
     public LifeCycle.State getState() {

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java?rev=1596321&r1=1596320&r2=1596321&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java Tue May 20 17:15:58 2014
@@ -59,7 +59,6 @@ public class LoggerContext extends Abstr
         PropertiesUtil.getProperties().getBooleanProperty("log4j.shutdownHookEnabled", true);
 
     public static final String PROPERTY_CONFIG = "config";
-    private static final org.apache.logging.log4j.Logger LOGGER = StatusLogger.getLogger();
     private static final Marker SHUTDOWN_HOOK = MarkerManager.getMarker("SHUTDOWN HOOK");
     private static final Configuration NULL_CONFIGURATION = new NullConfiguration();