You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2017/08/26 20:53:45 UTC
[27/50] logging-log4j2 git commit: [LOG4J2-922] Parameter of mdcId in
SyslogAppender has no default value.
[LOG4J2-922] Parameter of mdcId in SyslogAppender has no default value.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ce118362
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ce118362
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ce118362
Branch: refs/heads/LOG4J2-1431
Commit: ce1183629fe89625a77872c7153853e7774502a6
Parents: 915e681
Author: Paul Burrowes <pa...@metaswitch.com>
Authored: Wed Aug 23 09:38:36 2017 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Wed Aug 23 09:38:36 2017 -0600
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java | 2 +-
src/changes/changes.xml | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce118362/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java
index 77466b1..bd5fb95 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java
@@ -138,7 +138,7 @@ public final class Rfc5424Layout extends AbstractStringLayout {
this.includeMdc = includeMDC;
this.includeNewLine = includeNL;
this.escapeNewLine = escapeNL == null ? null : Matcher.quoteReplacement(escapeNL);
- this.mdcId = mdcId;
+ this.mdcId = id == null ? DEFAULT_MDCID : id;
this.mdcSdId = new StructuredDataId(mdcId, enterpriseNumber, null, null);
this.mdcPrefix = mdcPrefix;
this.eventPrefix = eventPrefix;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce118362/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 566767a..9aa8d87 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -43,6 +43,9 @@
<action issue="LOG4J2-2018" dev="rpopma" type="fix">
Fix incorrect documentation for LoggerNameLevelRewritePolicy.
</action>
+ <action issue="LOG4J2-922" dev="ggregory" type="fix" due-to="angus.aqlu, Paul Burrowes">
+ Parameter of mdcId in SyslogAppender has no default value.
+ </action>
<action issue="LOG4J2-2001" dev="ggregory" type="fix" due-to="Paul Burrowes">
StyleConverter.newInstance argument validation is incorrect.
</action>