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/01/19 01:45:02 UTC
logging-log4j2 git commit: Don't hide.
Repository: logging-log4j2
Updated Branches:
refs/heads/master f9b5bd882 -> bc7cc41b5
Don't hide.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/bc7cc41b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/bc7cc41b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/bc7cc41b
Branch: refs/heads/master
Commit: bc7cc41b513ee8069aa198e3a4e7260929aff16c
Parents: f9b5bd8
Author: ggregory <gg...@apache.org>
Authored: Mon Jan 18 16:45:00 2016 -0800
Committer: ggregory <gg...@apache.org>
Committed: Mon Jan 18 16:45:00 2016 -0800
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bc7cc41b/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 e3fef19..e35df2c 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
@@ -710,8 +710,8 @@ public final class Rfc5424Layout extends AbstractStringLayout {
return !foundNotEmptyValue;
}
- void union(final Map<String, String> fields) {
- this.fields.putAll(fields);
+ void union(final Map<String, String> addFields) {
+ this.fields.putAll(addFields);
}
Map<String, String> getFields() {