You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2016/09/24 15:41:01 UTC
logging-log4j2 git commit: LOG4J2-1611 improve
JdkMapAdapterStringMap::toString() to be consistent in alphabetic order (like
SortedArrayStringMap)
Repository: logging-log4j2
Updated Branches:
refs/heads/master 8353c6d0c -> 9d18e96ed
LOG4J2-1611 improve JdkMapAdapterStringMap::toString() to be consistent in alphabetic order (like SortedArrayStringMap)
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/9d18e96e
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/9d18e96e
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/9d18e96e
Branch: refs/heads/master
Commit: 9d18e96ed29d6109b7efb800c77ef67642809abb
Parents: 8353c6d
Author: rpopma <rp...@apache.org>
Authored: Sun Sep 25 00:40:50 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Sun Sep 25 00:40:50 2016 +0900
----------------------------------------------------------------------
.../apache/logging/log4j/core/impl/JdkMapAdapterStringMap.java | 3 ++-
.../logging/log4j/core/impl/JdkMapAdapterStringMapTest.java | 4 +++-
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9d18e96e/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/JdkMapAdapterStringMap.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/JdkMapAdapterStringMap.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/JdkMapAdapterStringMap.java
index 504b194..4e22a25 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/JdkMapAdapterStringMap.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/JdkMapAdapterStringMap.java
@@ -19,6 +19,7 @@ package org.apache.logging.log4j.core.impl;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
+import java.util.TreeMap;
import org.apache.logging.log4j.util.BiConsumer;
import org.apache.logging.log4j.util.ReadOnlyStringMap;
@@ -140,7 +141,7 @@ class JdkMapAdapterStringMap implements StringMap {
@Override
public String toString() {
- return map.toString();
+ return new TreeMap<>(map).toString();
}
@Override
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9d18e96e/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/JdkMapAdapterStringMapTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/JdkMapAdapterStringMapTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/JdkMapAdapterStringMapTest.java
index 482d399..027ca45 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/JdkMapAdapterStringMapTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/JdkMapAdapterStringMapTest.java
@@ -45,9 +45,11 @@ public class JdkMapAdapterStringMapTest {
public void testToString() {
final JdkMapAdapterStringMap original = new JdkMapAdapterStringMap();
original.putValue("a", "avalue");
+ original.putValue("a2", "bvalue");
original.putValue("B", "Bvalue");
+ original.putValue("C", "Cvalue");
original.putValue("3", "3value");
- assertEquals("{3=3value, B=Bvalue, a=avalue}", original.toString());
+ assertEquals("{3=3value, B=Bvalue, C=Cvalue, a=avalue, a2=bvalue}", original.toString());
}
@Test