Repository: logging-log4j2 Updated Branches: refs/heads/master ada28b3bb -> f9b5bd882
Rename ivar checker -> listChecker to avoid hiding in combo with param names. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/f9b5bd88 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/f9b5bd88 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/f9b5bd88 Branch: refs/heads/master Commit: f9b5bd882065ba302066254a351b5cdd4c0894f9 Parents: ada28b3 Author: ggregory <[email protected]> Authored: Mon Jan 18 16:43:41 2016 -0800 Committer: ggregory <[email protected]> Committed: Mon Jan 18 16:43:41 2016 -0800 ---------------------------------------------------------------------- .../org/apache/logging/log4j/core/layout/Rfc5424Layout.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f9b5bd88/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 64aaa6d..e3fef19 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 @@ -110,7 +110,7 @@ public final class Rfc5424Layout extends AbstractStringLayout { private final List<String> mdcExcludes; private final List<String> mdcIncludes; private final List<String> mdcRequired; - private final ListChecker checker; + private final ListChecker listChecker; private final ListChecker noopChecker = new NoopChecker(); private final boolean includeNewLine; private final String escapeNewLine; @@ -187,7 +187,7 @@ public final class Rfc5424Layout extends AbstractStringLayout { } else { mdcRequired = null; } - this.checker = c != null ? c : noopChecker; + this.listChecker = c != null ? c : noopChecker; final String name = config == null ? null : config.getName(); configName = Strings.isNotEmpty(name) ? name : null; this.fieldFormatters = createFieldFormatters(loggerFields, config); @@ -408,7 +408,7 @@ public final class Rfc5424Layout extends AbstractStringLayout { } for (final Map.Entry<String, StructuredDataElement> entry : sdElements.entrySet()) { - formatStructuredElement(entry.getKey(), mdcPrefix, entry.getValue(), buffer, checker); + formatStructuredElement(entry.getKey(), mdcPrefix, entry.getValue(), buffer, listChecker); } }
