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/22 03:51:25 UTC
logging-log4j2 git commit: Refactor properties ivar access.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 1815dab40 -> 518ff5645
Refactor properties ivar access.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/518ff564
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/518ff564
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/518ff564
Branch: refs/heads/master
Commit: 518ff56457599b310b952e0c115c025b50745513
Parents: 1815dab
Author: Gary Gregory <gg...@apache.org>
Authored: Wed Sep 21 20:51:23 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Wed Sep 21 20:51:23 2016 -0700
----------------------------------------------------------------------
.../log4j/config/Log4j1ConfigurationParser.java | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/518ff564/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 0d5be53..f529049 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
@@ -328,16 +328,24 @@ public class Log4j1ConfigurationParser {
}
private String getLog4jAppenderValue(final String appenderName, final String attributeName) {
- return properties.getProperty("log4j.appender." + appenderName + "." + attributeName);
+ return getProperty("log4j.appender." + appenderName + "." + attributeName);
+ }
+
+ private String getProperty(final String key) {
+ return properties.getProperty(key);
+ }
+
+ private String getProperty(final String key, String defaultValue) {
+ return properties.getProperty(key, defaultValue);
}
private String getLog4jAppenderValue(final String appenderName, final String attributeName,
final String defaultValue) {
- return properties.getProperty("log4j.appender." + appenderName + "." + attributeName, defaultValue);
+ return getProperty("log4j.appender." + appenderName + "." + attributeName, defaultValue);
}
private String getLog4jValue(final String key) {
- return properties.getProperty("log4j." + key);
+ return getProperty("log4j." + key);
}
private void reportWarning(final String msg) {