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/03/01 00:32:15 UTC

logging-log4j2 git commit: [LOG4J2-964] StringFormattedMessage serialization is incorrect.

Repository: logging-log4j2
Updated Branches:
  refs/heads/master cb959fde1 -> 16ad8763f


[LOG4J2-964] StringFormattedMessage serialization is incorrect.

Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/16ad8763
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/16ad8763
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/16ad8763

Branch: refs/heads/master
Commit: 16ad8763f378a3c4cc5ca82e5d0fbf10cc601b52
Parents: cb959fd
Author: Gary Gregory <ga...@gmail.com>
Authored: Sat Feb 28 15:32:02 2015 -0800
Committer: Gary Gregory <ga...@gmail.com>
Committed: Sat Feb 28 15:32:02 2015 -0800

----------------------------------------------------------------------
 .../log4j/message/StringFormattedMessage.java   |  4 +++-
 .../message/StringFormattedMessageTest.java     | 25 ++++++++++++++++++--
 src/changes/changes.xml                         |  5 ++++
 3 files changed, 31 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/16ad8763/log4j-api/src/main/java/org/apache/logging/log4j/message/StringFormattedMessage.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/StringFormattedMessage.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/StringFormattedMessage.java
index f6007e4..4c8429a 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/StringFormattedMessage.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/StringFormattedMessage.java
@@ -133,7 +133,9 @@ public class StringFormattedMessage implements Message {
         stringArgs = new String[argArray.length];
         int i = 0;
         for (final Object obj : argArray) {
-            stringArgs[i] = obj.toString();
+            final String string = obj.toString();
+            stringArgs[i] = string;
+            out.writeUTF(string);
             ++i;
         }
     }

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/16ad8763/log4j-api/src/test/java/org/apache/logging/log4j/message/StringFormattedMessageTest.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/message/StringFormattedMessageTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/message/StringFormattedMessageTest.java
index f7c1f0a..b7481a7 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/message/StringFormattedMessageTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/message/StringFormattedMessageTest.java
@@ -16,9 +16,17 @@
  */
 package org.apache.logging.log4j.message;
 
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 
-import static org.junit.Assert.*;
+import org.junit.Assert;
+import org.junit.Test;
 
 /**
  *
@@ -85,4 +93,17 @@ public class StringFormattedMessageTest {
         final String actual = msg.getFormattedMessage();
         assertEquals("Should use initial param value", "Test message abc", actual);
     }
+
+    @Test
+    public void testSerialization() throws IOException, ClassNotFoundException {
+        final StringFormattedMessage expected = new StringFormattedMessage("Msg", "a", "b", "c");
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        ObjectOutputStream out = new ObjectOutputStream(baos);
+        out.writeObject(expected);
+        out.close();
+        ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+        ObjectInputStream in = new ObjectInputStream(bais);
+        final StringFormattedMessage actual = (StringFormattedMessage) in.readObject();
+        Assert.assertEquals(expected, actual);
+    }
 }

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/16ad8763/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 9a765da..349d9e6 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -23,6 +23,11 @@
     <title>Changes</title>
   </properties>
   <body>
+    <release version="2.2.1" date="2015-0?-??" description="GA Release 2.2.1">
+      <action issue="LOG4J2-964" dev="ggregory" type="fix" due-to="Jonne JyrylÀ">
+        StringFormattedMessage serialization is incorrect.
+      </action>
+    </release>
     <release version="2.2" date="2015-02-22" description="GA Release 2.2">
       <action issue="LOG4J2-938" dev="rpopma" type="fix" due-to="Mauro Molinari">
         (JMX) To avoid memory leaks when web applications are restarted, JMX notifications are sent from