Repository: logging-log4j2 Updated Branches: refs/heads/master a4258b685 -> 955546040
[LOG4J2-959] Fix FindBugs DM_DEFAULT_ENCODING bug in SimpleLogger.logMessage() and simplify code. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/95554604 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/95554604 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/95554604 Branch: refs/heads/master Commit: 9555460405abf5276ffc5f39adb4b96e60e62e92 Parents: a4258b6 Author: Gary Gregory <garydgreg...@gmail.com> Authored: Mon Jun 8 16:28:01 2015 -0700 Committer: Gary Gregory <garydgreg...@gmail.com> Committed: Mon Jun 8 16:28:01 2015 -0700 ---------------------------------------------------------------------- .../java/org/apache/logging/log4j/simple/SimpleLogger.java | 8 +++----- src/changes/changes.xml | 3 +++ 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/95554604/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 dcfdbe4..26826f1 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 @@ -160,13 +160,11 @@ public class SimpleLogger extends AbstractLogger { } else { t = throwable; } + stream.println(sb.toString()); if (t != null) { - sb.append(SPACE); - final ByteArrayOutputStream baos = new ByteArrayOutputStream(); - t.printStackTrace(new PrintStream(baos)); - sb.append(baos.toString()); + stream.print(SPACE); + t.printStackTrace(stream); } - stream.println(sb.toString()); } public void setLevel(final Level level) { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/95554604/src/changes/changes.xml ---------------------------------------------------------------------- diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 11dc70b..9095af6 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -60,6 +60,9 @@ <action issue="LOG4J2-1022" dev="rgoers" type="update"> Allow a list of keys to be specified in the MDC pattern converter. </action> + <action issue="LOG4J2-959" dev="ggregory" type="update"> + Fix FindBugs DM_DEFAULT_ENCODING bug in SimpleLogger.logMessage() and simplify code. + </action> <action issue="LOG4J2-1017" dev="ggregory" type="update"> Update Java platform from Java 6 to 7. </action>
