Repository: logging-log4j2 Updated Branches: refs/heads/master 180b38c96 -> 762f601a9
Do not convert strings to Level objects internally since they can be variables. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/762f601a Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/762f601a Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/762f601a Branch: refs/heads/master Commit: 762f601a966aef70f86dde22b7473e0b769afd9f Parents: 180b38c Author: Gary Gregory <[email protected]> Authored: Fri Sep 23 18:37:51 2016 -0700 Committer: Gary Gregory <[email protected]> Committed: Fri Sep 23 18:37:51 2016 -0700 ---------------------------------------------------------------------- .../org/apache/log4j/config/Log4j1ConfigurationParser.java | 8 ++++---- .../log4j/config/Log4j1ConfigurationConverterHadoopTest.java | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/762f601a/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationParser.java ---------------------------------------------------------------------- diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationParser.java b/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationParser.java index ca13bab..bdcc32d 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationParser.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationParser.java @@ -360,7 +360,7 @@ public class Log4j1ConfigurationParser { return new String[0]; } final String[] rootLoggerParts = rootLoggerValue.split(COMMA_DELIMITED_RE); - final Level rootLoggerLevel = getLevel(rootLoggerParts, Level.ERROR); + final String rootLoggerLevel = getLevelString(rootLoggerParts, Level.ERROR.name()); final String[] sortedAppenderNames = Arrays.copyOfRange(rootLoggerParts, 1, rootLoggerParts.length); Arrays.sort(sortedAppenderNames); final RootLoggerComponentBuilder loggerBuilder = builder.newRootLogger(rootLoggerLevel); @@ -371,8 +371,8 @@ public class Log4j1ConfigurationParser { return sortedAppenderNames; } - private Level getLevel(final String[] loggerParts, final Level defaultLevel) { - return loggerParts.length > 0 ? Level.valueOf(loggerParts[0]) : defaultLevel; + private String getLevelString(final String[] loggerParts, final String defaultLevel) { + return loggerParts.length > 0 ? loggerParts[0] : defaultLevel; } private void buildLoggers(final String prefix) { @@ -388,7 +388,7 @@ public class Log4j1ConfigurationParser { // a Level may be followed by a list of Appender refs. final String valueStr = value.toString(); final String[] split = valueStr.split(COMMA_DELIMITED_RE); - final Level level = getLevel(split, null); + final String level = getLevelString(split, null); if (level == null) { warn("Level is missing for entry " + entry); } else { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/762f601a/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationConverterHadoopTest.java ---------------------------------------------------------------------- diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationConverterHadoopTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationConverterHadoopTest.java index fd40ed7..06cbc9d 100644 --- a/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationConverterHadoopTest.java +++ b/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationConverterHadoopTest.java @@ -25,7 +25,6 @@ import org.junit.runners.Parameterized; * limitations under the license. */ -@Ignore("Some files cannot be converted!") @RunWith(Parameterized.class) public class Log4j1ConfigurationConverterHadoopTest extends AbstractLog4j1ConfigurationConverterTest {
