null check added for null header properties

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

1 files changed, 14 insertions, 7 deletions

diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java b/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
index 54dd366d71..1bdf265a1b 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
@@ -275,22 +275,29 @@ public class AMQQueueMBean extends AMQManagedObject implements ManagedQueue
         // get message content
         List<ContentBody> cBodies = msg.getContentBodies();
         List<Byte> msgContent = new ArrayList<Byte>();
-        for (ContentBody body : cBodies)
+        if (cBodies != null)
         {
-            if (body.getSize() != 0)
+            for (ContentBody body : cBodies)
             {
-                ByteBuffer slice = body.payload.slice();
-                for (int j = 0; j < slice.limit(); j++)
+                if (body.getSize() != 0)
                 {
-                    msgContent.add(slice.get());
+                    ByteBuffer slice = body.payload.slice();
+                    for (int j = 0; j < slice.limit(); j++)
+                    {
+                        msgContent.add(slice.get());
+                    }
                 }
             }
         }
 
         // Create header attributes list
         BasicContentHeaderProperties headerProperties = (BasicContentHeaderProperties) msg.getContentHeaderBody().properties;
-        String mimeType = headerProperties.getContentType();
-        String encoding = headerProperties.getEncoding() == null ? "" : headerProperties.getEncoding();
+        String mimeType = null, encoding = null;
+        if (headerProperties != null)
+        {
+            mimeType = headerProperties.getContentType();
+            encoding = headerProperties.getEncoding() == null ? "" : headerProperties.getEncoding();
+        }
         Object[] itemValues = {msgId, mimeType, encoding, msgContent.toArray(new Byte[0])};
 
         return new CompositeDataSupport(_msgContentType, _msgContentAttributes, itemValues);