LOG4J2-1326 SimpleMessage serialized format changed -simplified
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/34bc95df Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/34bc95df Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/34bc95df Branch: refs/heads/LOG4J2-1356 Commit: 34bc95df3f20a5a5d69106a41bda29348b7de755 Parents: 14e850b Author: rpopma <[email protected]> Authored: Fri Apr 8 08:39:36 2016 +0900 Committer: rpopma <[email protected]> Committed: Fri Apr 8 08:39:36 2016 +0900 ---------------------------------------------------------------------- .../java/org/apache/logging/log4j/message/SimpleMessage.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/34bc95df/log4j-api/src/main/java/org/apache/logging/log4j/message/SimpleMessage.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/SimpleMessage.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/SimpleMessage.java index 106040e..31d35b1 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/message/SimpleMessage.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/SimpleMessage.java @@ -127,16 +127,12 @@ public class SimpleMessage implements Message, StringBuilderFormattable { } private void writeObject(final ObjectOutputStream out) throws IOException { + getFormattedMessage(); // initialize the message:String field out.defaultWriteObject(); - if (charSequence instanceof Serializable) { - out.writeObject(charSequence); - } else { - out.writeObject(String.valueOf(charSequence)); - } } private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException { in.defaultReadObject(); - charSequence = (CharSequence) in.readObject(); + charSequence = message; } }
