QPID-3714 : Fix for NPE when a transient message (or when using the Memory Store) has no body

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1227162 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 8 insertions, 0 deletions

diff --git a/java/broker/src/main/java/org/apache/qpid/server/store/StoredMemoryMessage.java b/java/broker/src/main/java/org/apache/qpid/server/store/StoredMemoryMessage.java
index 858a850d8c..144cc629bd 100755
--- a/java/broker/src/main/java/org/apache/qpid/server/store/StoredMemoryMessage.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/store/StoredMemoryMessage.java
@@ -84,6 +84,10 @@ public class StoredMemoryMessage implements StoredMessage
 
     public int getContent(int offset, ByteBuffer dst)
     {
+        if(_content == null)
+        {
+            return 0;
+        }
         ByteBuffer src = _content.duplicate();
 
         int oldPosition = src.position();
@@ -102,6 +106,10 @@ public class StoredMemoryMessage implements StoredMessage
 
     public ByteBuffer getContent(int offsetInMessage, int size)
     {
+        if(_content == null)
+        {
+            return null;
+        }
         ByteBuffer buf = _content.duplicate();
 
         if(offsetInMessage != 0)