Author: ritchiem
Date: Tue Jun 3 05:38:18 2008
New Revision: 662773
URL: http://svn.apache.org/viewvc?rev=662773&view=rev
Log:
Merged revisions 662770 via svnmerge from
https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.x
........
r662770 | ritchiem | 2008-06-03 13:32:47 +0100 (Tue, 03 Jun 2008) | 3 lines
QPID-1092 : Changed toString to be String.valueOf(getObject())
Added MessageToStringTest, tests performing toString on Message before
calling getObject().
........
Added:
incubator/qpid/branches/M2.1.x/java/systests/src/main/java/org/apache/qpid/test/client/message/
- copied from r662770,
incubator/qpid/branches/M2.x/java/systests/src/main/java/org/apache/qpid/test/client/message/
incubator/qpid/branches/M2.1.x/java/systests/src/main/java/org/apache/qpid/test/client/message/MessageToStringTest.java
- copied unchanged from r662770,
incubator/qpid/branches/M2.x/java/systests/src/main/java/org/apache/qpid/test/client/message/MessageToStringTest.java
Modified:
incubator/qpid/branches/M2.1.x/ (props changed)
incubator/qpid/branches/M2.1.x/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessage.java
Propchange: incubator/qpid/branches/M2.1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
incubator/qpid/branches/M2.1.x/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessage.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1.x/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessage.java?rev=662773&r1=662772&r2=662773&view=diff
==============================================================================
---
incubator/qpid/branches/M2.1.x/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessage.java
(original)
+++
incubator/qpid/branches/M2.1.x/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessage.java
Tue Jun 3 05:38:18 2008
@@ -88,7 +88,7 @@
public String toBodyString() throws JMSException
{
- return toString(_data);
+ return String.valueOf(getObject());
}
public AMQShortString getMimeTypeAsShortString()
@@ -172,26 +172,4 @@
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);
- }
- }
}
