Repository: logging-log4j2 Updated Branches: refs/heads/master d70a3872c -> 0916da7e8
Code clean ups and sort appender names for a logger's appender refs. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/0916da7e Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/0916da7e Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/0916da7e Branch: refs/heads/master Commit: 0916da7e8081e6c9e1df1a444d2ad754e3fdfa0e Parents: d70a387 Author: Gary Gregory <[email protected]> Authored: Fri Sep 23 23:05:30 2016 -0700 Committer: Gary Gregory <[email protected]> Committed: Fri Sep 23 23:05:30 2016 -0700 ---------------------------------------------------------------------- .../log4j/config/Log4j1ConfigurationParser.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0916da7e/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 ca870c9..894f6e5 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 @@ -361,20 +361,20 @@ public class Log4j1ConfigurationParser { return layoutBuilder; } - private String[] buildRootLogger(final String rootLoggerValue) { + private void buildRootLogger(final String rootLoggerValue) { if (rootLoggerValue == null) { - return new String[0]; + return; } final String[] rootLoggerParts = rootLoggerValue.split(COMMA_DELIMITED_RE); final String rootLoggerLevel = getLevelString(rootLoggerParts, Level.ERROR.name()); + final RootLoggerComponentBuilder loggerBuilder = builder.newRootLogger(rootLoggerLevel); + // final String[] sortedAppenderNames = Arrays.copyOfRange(rootLoggerParts, 1, rootLoggerParts.length); Arrays.sort(sortedAppenderNames); - final RootLoggerComponentBuilder loggerBuilder = builder.newRootLogger(rootLoggerLevel); for (final String appender : sortedAppenderNames) { loggerBuilder.add(builder.newAppenderRef(appender)); } builder.add(loggerBuilder); - return sortedAppenderNames; } private String getLevelString(final String[] loggerParts, final String defaultLevel) { @@ -401,8 +401,10 @@ public class Log4j1ConfigurationParser { final LoggerComponentBuilder newLogger = builder.newLogger(name, level); if (split.length > 1) { // Add Appenders to this logger - for (int i = 1; i < split.length; i++) { - newLogger.add(builder.newAppenderRef(split[i])); + final String[] sortedAppenderNames = Arrays.copyOfRange(split, 1, split.length); + Arrays.sort(sortedAppenderNames); + for (String appenderName : sortedAppenderNames) { + newLogger.add(builder.newAppenderRef(appenderName)); } } builder.add(newLogger);
