1 files changed, 1 insertions, 1 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/message/MessageTransferMessage.java b/java/broker/src/main/java/org/apache/qpid/server/message/MessageTransferMessage.java
index e866ad5078..baa5dce14f 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/message/MessageTransferMessage.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/message/MessageTransferMessage.java
@@ -119,7 +119,7 @@ public class MessageTransferMessage implements InboundMessage, ServerMessage
     public ByteBuffer getBody()
     {
         ByteBuffer body = getMetaData().getBody();
-        if(body == null)
+        if(body == null && getSize() != 0l)
         {
             final int size = (int) getSize();
             int pos = 0;