Repository: logging-log4j2 Updated Branches: refs/heads/master f2167ad38 -> 5e53446a2
LOG4J2-1716 bugfix & additional test Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/5e53446a Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/5e53446a Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/5e53446a Branch: refs/heads/master Commit: 5e53446a2b7bfdd53064c05fdaa61686d769f6ba Parents: f2167ad Author: rpopma <rpo...@apache.org> Authored: Mon Nov 21 02:06:49 2016 +0900 Committer: rpopma <rpo...@apache.org> Committed: Mon Nov 21 02:06:49 2016 +0900 ---------------------------------------------------------------------- .../logging/log4j/core/pattern/MapPatternConverter.java | 11 +++++------ .../log4j/core/pattern/MapPatternConverterTest.java | 2 ++ 2 files changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5e53446a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MapPatternConverter.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MapPatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MapPatternConverter.java index 528e747..e1c6813 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MapPatternConverter.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MapPatternConverter.java @@ -74,15 +74,14 @@ public final class MapPatternConverter extends LogEventPatternConverter { toAppendTo.append("{}"); return; } - final StringBuilder sb = toAppendTo.append("{"); + toAppendTo.append("{"); for (int i = 0; i < sortedMap.size(); i++) { - if (sb.length() > 1) { - sb.append(", "); + if (i > 0) { + toAppendTo.append(", "); } - sb.append(sortedMap.getKeyAt(i)).append('=').append(sortedMap.getValueAt(i)); + toAppendTo.append(sortedMap.getKeyAt(i)).append('=').append(sortedMap.getValueAt(i)); } - sb.append('}'); - toAppendTo.append(sb); + toAppendTo.append('}'); } else { // otherwise they just want a single key output final String val = sortedMap.getValue(key); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5e53446a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/MapPatternConverterTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/MapPatternConverterTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/MapPatternConverterTest.java index 6a15d72..23ebd36 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/MapPatternConverterTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/MapPatternConverterTest.java @@ -51,6 +51,8 @@ public class MapPatternConverterTest { assertTrue("Missing or incorrect verb", str.contains(expected)); expected = "object=Log4j"; assertTrue("Missing or incorrect object", str.contains(expected)); + + assertEquals("{object=Log4j, subject=I, verb=love}", str); } @Test
