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 2016/09/24 05:50:39 UTC
logging-log4j2 git commit: Fix regression.
Repository: logging-log4j2
Updated Branches:
refs/heads/master a9358ce20 -> d70a3872c
Fix regression.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/d70a3872
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d70a3872
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d70a3872
Branch: refs/heads/master
Commit: d70a3872cef04c77e9f062ed6ec5fd9bd76c7e06
Parents: a9358ce
Author: Gary Gregory <gg...@apache.org>
Authored: Fri Sep 23 22:50:36 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Fri Sep 23 22:50:36 2016 -0700
----------------------------------------------------------------------
.../log4j/config/Log4j1ConfigurationParser.java | 22 ++++++++------------
1 file changed, 9 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d70a3872/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 a5c0243..ca870c9 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
@@ -106,13 +106,11 @@ public class Log4j1ConfigurationParser {
builder.setStatusLevel(Level.DEBUG);
}
// Root
- final String[] sortedAppenderNamesC = buildRootLogger(getLog4jValue(ROOTCATEGORY));
- final String[] sortedAppenderNamesL = buildRootLogger(getLog4jValue(ROOTLOGGER));
- final String[] sortedAppenderNames = sortedAppenderNamesL.length > 0 ? sortedAppenderNamesL
- : sortedAppenderNamesC;
+ buildRootLogger(getLog4jValue(ROOTCATEGORY));
+ buildRootLogger(getLog4jValue(ROOTLOGGER));
// Appenders
- final Map<String, String> classNameToProperty = buildClassToPropertyPrefixMap(sortedAppenderNames);
- for (final Map.Entry<String, String> entry : classNameToProperty.entrySet()) {
+ final Map<String, String> appenderNameToClassName = buildClassToPropertyPrefixMap();
+ for (final Map.Entry<String, String> entry : appenderNameToClassName.entrySet()) {
final String appenderName = entry.getKey();
final String appenderClass = entry.getValue();
buildAppender(appenderName, appenderClass);
@@ -140,10 +138,10 @@ public class Log4j1ConfigurationParser {
System.err.println(string);
}
- private Map<String, String> buildClassToPropertyPrefixMap(final String[] sortedAppenderNames) {
+ private Map<String, String> buildClassToPropertyPrefixMap() {
final String prefix = "log4j.appender.";
final int preLength = prefix.length();
- final Map<String, String> map = new HashMap<>(sortedAppenderNames.length);
+ final Map<String, String> map = new HashMap<>();
for (final Map.Entry<Object, Object> entry : properties.entrySet()) {
final Object keyObj = entry.getKey();
if (keyObj != null) {
@@ -151,11 +149,9 @@ public class Log4j1ConfigurationParser {
if (key.startsWith(prefix)) {
if (key.indexOf('.', preLength) < 0) {
final String name = key.substring(preLength);
- if (Arrays.binarySearch(sortedAppenderNames, name) == -1) {
- final Object value = entry.getValue();
- if (value != null) {
- map.put(name, value.toString());
- }
+ final Object value = entry.getValue();
+ if (value != null) {
+ map.put(name, value.toString());
}
}
}