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 2015/05/29 02:12:12 UTC
logging-log4j2 git commit: [LOG4J2-1033] SimpleLogger creates
unnecessary Map objects by calling ThreadContext.getContext() instead of
getImmutableContext().
Repository: logging-log4j2
Updated Branches:
refs/heads/master e2acc9b01 -> 2a18cc118
[LOG4J2-1033] SimpleLogger creates unnecessary Map objects by calling
ThreadContext.getContext() instead of getImmutableContext().
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/2a18cc11
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/2a18cc11
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/2a18cc11
Branch: refs/heads/master
Commit: 2a18cc1182ecb7e8d2facf76460563d175df1250
Parents: e2acc9b
Author: Gary Gregory <ga...@gmail.com>
Authored: Thu May 28 17:12:02 2015 -0700
Committer: Gary Gregory <ga...@gmail.com>
Committed: Thu May 28 17:12:02 2015 -0700
----------------------------------------------------------------------
.../main/java/org/apache/logging/log4j/simple/SimpleLogger.java | 2 +-
log4j-api/src/test/java/org/apache/logging/log4j/TestLogger.java | 2 +-
src/changes/changes.xml | 3 +++
3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2a18cc11/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLogger.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLogger.java b/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLogger.java
index 90fc598..3ea6833 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLogger.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLogger.java
@@ -145,7 +145,7 @@ public class SimpleLogger extends AbstractLogger {
}
sb.append(msg.getFormattedMessage());
if (showContextMap) {
- final Map<String, String> mdc = ThreadContext.getContext();
+ final Map<String, String> mdc = ThreadContext.getImmutableContext();
if (mdc.size() > 0) {
sb.append(SPACE);
sb.append(mdc.toString());
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2a18cc11/log4j-api/src/test/java/org/apache/logging/log4j/TestLogger.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/TestLogger.java b/log4j-api/src/test/java/org/apache/logging/log4j/TestLogger.java
index 352c1b6..22f0d21 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/TestLogger.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/TestLogger.java
@@ -61,7 +61,7 @@ public class TestLogger extends AbstractLogger {
sb.append(level.toString());
sb.append(' ');
sb.append(msg.getFormattedMessage());
- final Map<String, String> mdc = ThreadContext.getContext();
+ final Map<String, String> mdc = ThreadContext.getImmutableContext();
if (mdc.size() > 0) {
sb.append(' ');
sb.append(mdc.toString());
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2a18cc11/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 196ae40..38ea43d 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -24,6 +24,9 @@
</properties>
<body>
<release version="2.4" date="2015-MM-DD" description="GA Release 2.4">
+ <action issue="LOG4J2-1033" dev="ggregory" type="fix" due-to="Mikael Ståldal">
+ SimpleLogger creates unnecessary Map objects by calling ThreadContext.getContext() instead of getImmutableContext().
+ </action>
<action issue="LOG4J2-403" dev="ggregory" type="update" due-to="Poorna Subhash P, Jeremy Lautman">
MongoDB appender, username and password should be optional.
</action>