From 0d83b326fa511f0dfe3eccc710129e09869721d8 Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Wed, 4 Jan 2012 13:55:37 +0000 Subject: 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@1227162 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/qpid/server/store/StoredMemoryMessage.java | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'qpid/java') diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/StoredMemoryMessage.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/StoredMemoryMessage.java index 858a850d8c..144cc629bd 100755 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/StoredMemoryMessage.java +++ b/qpid/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) -- cgit v1.2.1