Content.writePayload now handles a null byte buffer

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-9@499550 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 6 insertions, 2 deletions

diff --git a/java/common/src/main/java/org/apache/qpid/framing/Content.java b/java/common/src/main/java/org/apache/qpid/framing/Content.java
index b5b0e19dbb..e9c70ea449 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/Content.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/Content.java
@@ -125,8 +125,12 @@ public class Content
     public void writePayload(ByteBuffer buffer)
     {
     	EncodingUtils.writeUnsignedByte(buffer, contentType.toByte());
-    	EncodingUtils.writeUnsignedInteger(buffer, content.remaining());
-        buffer.put(content.duplicate());
+        if (content == null) {
+            EncodingUtils.writeUnsignedInteger(buffer, 0);
+        } else {
+            EncodingUtils.writeUnsignedInteger(buffer, content.remaining());
+            buffer.put(content.duplicate());
+        }
     }
     
     public void populateFromBuffer(ByteBuffer buffer) throws AMQFrameDecodingException