diff options
| author | Robert Greig <rgreig@apache.org> | 2006-12-16 09:34:47 +0000 |
|---|---|---|
| committer | Robert Greig <rgreig@apache.org> | 2006-12-16 09:34:47 +0000 |
| commit | 3c5e3b491e94fef2cadc0b7a5691cf3d071b7c4d (patch) | |
| tree | 2dfa977fcd2e4e3bdf55de41ad9200918fe03893 /qpid/java | |
| parent | 62c0bb60ac50129440042b1a198485145c323514 (diff) | |
| download | qpid-python-3c5e3b491e94fef2cadc0b7a5691cf3d071b7c4d.tar.gz | |
QPID-195 : Fix to JMSObjectMessage so that setObject(null) rteurns the message to it's initial state (_data = null), for which getObject() correctly returns null.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@487778 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
2 files changed, 10 insertions, 2 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 c9fba083ed..4fb070d2ff 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 @@ -71,8 +71,8 @@ public class JMSObjectMessage extends AbstractJMSMessage implements ObjectMessag { _data.release(); } - _data = ByteBuffer.allocate(DEFAULT_BUFFER_SIZE); - _data.setAutoExpand(true); + _data = null; + } public String toBodyString() throws JMSException @@ -98,6 +98,7 @@ public class JMSObjectMessage extends AbstractJMSMessage implements ObjectMessag { _data.rewind(); } + try { ObjectOutputStream out = new ObjectOutputStream(_data.asOutputStream()); @@ -109,6 +110,7 @@ public class JMSObjectMessage extends AbstractJMSMessage implements ObjectMessag { throw new MessageFormatException("Message not serializable: " + e); } + } public Serializable getObject() throws JMSException diff --git a/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java index 07eedc8bb9..bbd1870168 100644 --- a/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java +++ b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java @@ -167,6 +167,12 @@ public class ObjectMessageTest extends TestCase implements MessageListener } + public void testSetObjectForNull() throws Exception + { + ObjectMessage msg = session.createObjectMessage(); + msg.setObject(null); + assertNull(msg.getObject()); + } private void send() throws Exception |