Rename to avoid hidding. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/f817ac3b Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/f817ac3b Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/f817ac3b
Branch: refs/heads/LOG4J-1181 Commit: f817ac3b80ece4d5d958ff81f52985e25d81362b Parents: f525166 Author: ggregory <[email protected]> Authored: Fri Oct 30 12:42:53 2015 -0700 Committer: ggregory <[email protected]> Committed: Fri Oct 30 12:42:53 2015 -0700 ---------------------------------------------------------------------- .../apache/logging/log4j/core/layout/PatternLayout.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f817ac3b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java index ada0e15..b6dbfd8 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java @@ -84,7 +84,7 @@ public final class PatternLayout extends AbstractStringLayout { /** * Initial converter for pattern. */ - private final PatternFormatter[] formatters; + private final PatternFormatter[] patternFormatters; /** * Conversion pattern. @@ -138,12 +138,12 @@ public final class PatternLayout extends AbstractStringLayout { try { List<PatternFormatter> list = parser.parse(pattern == null ? DEFAULT_CONVERSION_PATTERN : pattern, this.alwaysWriteExceptions, this.noConsoleNoAnsi); - this.formatters = list.toArray(new PatternFormatter[0]); + this.patternFormatters = list.toArray(new PatternFormatter[0]); } catch (RuntimeException ex) { throw new IllegalArgumentException("Cannot parse pattern '" + pattern + "'", ex); } } else { - this.formatters = null; + this.patternFormatters = null; serializer = new PatternSelectorSerializer(); } } @@ -286,9 +286,9 @@ public final class PatternLayout extends AbstractStringLayout { @Override public String toSerializable(final LogEvent event) { final StringBuilder buf = getStringBuilder(); - final int len = formatters.length; + final int len = patternFormatters.length; for (int i = 0; i < len; i++) { - formatters[i].format(event, buf); + patternFormatters[i].format(event, buf); } String str = buf.toString(); if (replace != null) {
