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/12 01:56:05 UTC
logging-log4j2 git commit: Rename life cycle state INITIAL to
INITIALIZING as discussed on the ML.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 381144c2c -> ffca20367
Rename life cycle state INITIAL to INITIALIZING as discussed on the ML.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ffca2036
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ffca2036
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ffca2036
Branch: refs/heads/master
Commit: ffca20367627ab5ee2d597d1194e0f33efbe303d
Parents: 381144c
Author: ggregory <gg...@apache.org>
Authored: Fri Sep 11 16:56:02 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Fri Sep 11 16:56:02 2015 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/logging/log4j/core/LifeCycle.java | 2 +-
.../apache/logging/log4j/core/config/AbstractConfiguration.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ffca2036/log4j-core/src/main/java/org/apache/logging/log4j/core/LifeCycle.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/LifeCycle.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/LifeCycle.java
index 4562f5a..8250197 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/LifeCycle.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/LifeCycle.java
@@ -34,7 +34,7 @@ public interface LifeCycle {
*/
public enum State {
/** Object is in its initial state and not yet initialized */
- INITIAL,
+ INITIALIZING,
/** Initialized but not yet started. */
INITIALIZED,
/** In the process of starting. */
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ffca2036/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
index d16e556..3614494 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
@@ -117,7 +117,7 @@ public abstract class AbstractConfiguration extends AbstractFilterable implement
componentMap.put(Configuration.CONTEXT_PROPERTIES, properties);
pluginManager = new PluginManager(Node.CATEGORY);
rootNode = new Node();
- setState(State.INITIAL);
+ setState(State.INITIALIZING);
}
@Override
@@ -169,7 +169,7 @@ public abstract class AbstractConfiguration extends AbstractFilterable implement
@Override
public void start() {
// Preserve the prior behavior of initializing during start if not initialized.
- if (getState().equals(State.INITIAL)) {
+ if (getState().equals(State.INITIALIZING)) {
initialize();
}
LOGGER.debug("Starting configuration {}", this);