From a055cd3df1490c97b41f31ab35dd18de6f44451a Mon Sep 17 00:00:00 2001 From: Aidan Skinner Date: Tue, 12 Aug 2008 11:00:07 +0000 Subject: 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 --- .../qpid/client/message/JMSObjectMessage.java | 24 +--------------------- 1 file changed, 1 insertion(+), 23 deletions(-) (limited to 'qpid/java/client') 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); - } - } } -- cgit v1.2.1