Author: rgreig
Date: Sat Dec 16 01:34:47 2006
New Revision: 487778
URL: http://svn.apache.org/viewvc?view=rev&rev=487778
Log:
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.
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessage.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessage.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessage.java?view=diff&rev=487778&r1=487777&r2=487778
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessage.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessage.java
Sat Dec 16 01:34:47 2006
@@ -71,8 +71,8 @@
{
_data.release();
}
- _data = ByteBuffer.allocate(DEFAULT_BUFFER_SIZE);
- _data.setAutoExpand(true);
+ _data = null;
+
}
public String toBodyString() throws JMSException
@@ -98,6 +98,7 @@
{
_data.rewind();
}
+
try
{
ObjectOutputStream out = new
ObjectOutputStream(_data.asOutputStream());
@@ -109,6 +110,7 @@
{
throw new MessageFormatException("Message not serializable: " + e);
}
+
}
public Serializable getObject() throws JMSException
Modified:
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java?view=diff&rev=487778&r1=487777&r2=487778
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java
Sat Dec 16 01:34:47 2006
@@ -167,6 +167,12 @@
}
+ public void testSetObjectForNull() throws Exception
+ {
+ ObjectMessage msg = session.createObjectMessage();
+ msg.setObject(null);
+ assertNull(msg.getObject());
+ }
private void send() throws Exception
