1 files changed, 19 insertions, 1 deletions
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ObjectMessageImpl.java b/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ObjectMessageImpl.java
index 2a52b0557a..95c1497d07 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ObjectMessageImpl.java
+++ b/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ObjectMessageImpl.java
@@ -40,7 +40,25 @@ public class ObjectMessageImpl extends MessageImpl implements ObjectMessage
 {
     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,