Author: rgodfrey
Date: Wed Nov 28 09:02:55 2012
New Revision: 1414595
URL: http://svn.apache.org/viewvc?rev=1414595&view=rev
Log:
QPID-4453 : ObjectMessage /w no body improperly converted to an AMQP message.
merge from trunk r1412270
Modified:
qpid/branches/0.20/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ObjectMessageImpl.java
Modified:
qpid/branches/0.20/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ObjectMessageImpl.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.20/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ObjectMessageImpl.java?rev=1414595&r1=1414594&r2=1414595&view=diff
==============================================================================
---
qpid/branches/0.20/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ObjectMessageImpl.java
(original)
+++
qpid/branches/0.20/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ObjectMessageImpl.java
Wed Nov 28 09:02:55 2012
@@ -40,7 +40,25 @@ public class ObjectMessageImpl extends M
{
static final Symbol CONTENT_TYPE =
Symbol.valueOf("application/x-java-serialized-object");
- private Data _objectData;
+ static final Data NULL_OBJECT_DATA;
+ static
+ {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ try
+ {
+ ObjectOutputStream oos = new ObjectOutputStream(baos);
+ oos.writeObject(null);
+ oos.flush();
+ oos.close();
+ }
+ catch (IOException e)
+ {
+ throw new RuntimeException(e);
+ }
+ NULL_OBJECT_DATA = new Data(new Binary(baos.toByteArray()));
+ }
+
+ private Data _objectData = NULL_OBJECT_DATA;
protected ObjectMessageImpl(Header header,
MessageAnnotations messageAnnotations,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
