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 2015/06/02 23:46:06 UTC
logging-log4j2 git commit: In-line single occurance of ivar.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 590a228bd -> c57044b13
In-line single occurance of ivar.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/c57044b1
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c57044b1
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c57044b1
Branch: refs/heads/master
Commit: c57044b131707c3d2a48883d4a451397fd8578ac
Parents: 590a228
Author: Gary Gregory <ga...@gmail.com>
Authored: Tue Jun 2 14:46:05 2015 -0700
Committer: Gary Gregory <ga...@gmail.com>
Committed: Tue Jun 2 14:46:05 2015 -0700
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c57044b1/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 81e5bb2..39911aa 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
@@ -646,14 +646,13 @@ public final class Rfc5424Layout extends AbstractStringLayout {
@PluginAttribute(value = "useTlsMessageFormat", defaultBoolean = false) final boolean useTlsMessageFormat, // RFC 5425
@PluginElement("LoggerFields") final LoggerFields[] loggerFields,
@PluginConfiguration final Configuration config) {
- final Charset charset = Constants.UTF_8;
if (includes != null && excludes != null) {
LOGGER.error("mdcIncludes and mdcExcludes are mutually exclusive. Includes wil be ignored");
includes = null;
}
return new Rfc5424Layout(config, facility, id, enterpriseNumber, includeMDC, newLine, escapeNL, mdcId, mdcPrefix,
- eventPrefix, appName, msgId, excludes, includes, required, charset, exceptionPattern,
+ eventPrefix, appName, msgId, excludes, includes, required, Constants.UTF_8, exceptionPattern,
useTlsMessageFormat, loggerFields);
}