QPID-1092: Merge 662770 to trunk from ritchiem:

Changed toString to be String.valueOf(getObject())
Added MessageToStringTest, tests performing toString on Message before calling getObject().

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@685115 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 103 insertions, 23 deletions

diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessage.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessage.java
index 0c431d42e6..39b9597af1 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessage.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessage.java
@@ -90,7 +90,7 @@ public class JMSObjectMessage extends AbstractJMSMessage implements ObjectMessag
 
     public String toBodyString() throws JMSException
     {
-        return toString(_data);
+        return String.valueOf(getObject());
     }
 
     public String getMimeType()
@@ -174,26 +174,4 @@ public class JMSObjectMessage extends AbstractJMSMessage implements ObjectMessag
         catch (IOException ignore)
         { }
     }
-
-    private static String toString(ByteBuffer data)
-    {
-        if (data == null)
-        {
-            return null;
-        }
-
-        int pos = data.position();
-        try
-        {
-            return data.getString(Charset.forName("UTF8").newDecoder());
-        }
-        catch (CharacterCodingException e)
-        {
-            return null;
-        }
-        finally
-        {
-            data.position(pos);
-        }
-    }
 }
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/MessageToStringTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/MessageToStringTest.java
new file mode 100644
index 0000000000..d61d75d1b8
--- /dev/null
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/MessageToStringTest.java
@@ -0,0 +1,102 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.test.client.message;
+
+import org.apache.qpid.client.AMQQueue;
+import org.apache.qpid.test.utils.QpidTestCase;
+
+import javax.jms.BytesMessage;
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.ObjectMessage;
+import javax.jms.Queue;
+import javax.jms.Session;
+import java.util.UUID;
+
+public class MessageToStringTest extends QpidTestCase
+{
+    private Connection _connection;
+    private Session _session;
+    private Queue _queue;
+    MessageConsumer _consumer;
+
+    public void setUp() throws Exception
+    {
+        super.setUp();
+
+        //Create Producer put some messages on the queue
+        _connection = getConnection();
+
+        //Create Queue
+        _queue = new AMQQueue("amq.direct", "queue");
+
+        //Create Consumer
+        _session = _connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+        _consumer = _session.createConsumer(_queue);
+
+        _connection.start();
+    }
+
+    public void tearDown() throws Exception
+    {
+        //clean up
+        _connection.close();
+
+        super.tearDown();
+    }
+
+    public void testObjectMessage() throws JMSException
+    {
+        MessageProducer producer = _session.createProducer(_queue);
+
+        //Create Sample Message using UUIDs
+        UUID test = UUID.randomUUID();
+
+        Message testMessage = _session.createObjectMessage(test);
+
+        producer.send(testMessage);
+
+        Message receivedMessage = _consumer.receive(1000);
+
+        assertNotNull("Message was not received.", receivedMessage);
+
+        assertNotNull("Message returned null from toString", receivedMessage.toString());
+
+        UUID result = null;
+
+        try
+        {
+            result = (UUID) ((ObjectMessage) receivedMessage).getObject();
+        }
+        catch (Exception e)
+        {
+            fail(e.getMessage());
+        }
+
+        assertEquals("UUIDs were not equal", test, result);
+    }
+
+}