Only release content for durable queues.

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

2 files changed, 18 insertions, 10 deletions

diff --git a/cpp/src/qpid/broker/Message.cpp b/cpp/src/qpid/broker/Message.cpp
index cff834c765..e01a553207 100644
--- a/cpp/src/qpid/broker/Message.cpp
+++ b/cpp/src/qpid/broker/Message.cpp
@@ -145,16 +145,18 @@ void Message::decodeContent(framing::Buffer& buffer)
 
 void Message::releaseContent(MessageStore* _store)
 {
-    if (!store){
-		store = _store;
-	}
-    if (!getPersistenceId()) {
-        intrusive_ptr<PersistableMessage> pmsg(this);
-        store->stage(pmsg);
+    if (!store) {
+        store = _store;
+    }
+    if (store) {
+        if (!getPersistenceId()) {
+            intrusive_ptr<PersistableMessage> pmsg(this);
+            store->stage(pmsg);
+        }
+        //remove any content frames from the frameset
+        frames.remove(TypeFilter<CONTENT_BODY>());
+        setContentReleased();
     }
-    //remove any content frames from the frameset
-    frames.remove(TypeFilter<CONTENT_BODY>());
-    setContentReleased();
 }
 
 void Message::sendContent(Queue& queue, framing::FrameHandler& out, uint16_t maxFrameSize) const
diff --git a/cpp/src/qpid/broker/Queue.cpp b/cpp/src/qpid/broker/Queue.cpp
index a5384014d8..b68a7db8b0 100644
--- a/cpp/src/qpid/broker/Queue.cpp
+++ b/cpp/src/qpid/broker/Queue.cpp
@@ -388,7 +388,13 @@ void Queue::push(intrusive_ptr<Message>& msg){
     if (policy.get()) {
         policy->enqueued(msg->contentSize());
         if (policy->limitExceeded()) {
-            msg->releaseContent(store);
+            if (store) {
+                QPID_LOG(debug, "Message " << msg << " on " << name << " released from memory");
+                msg->releaseContent(store);
+            } else {
+                QPID_LOG(warning, "Message " << msg << " on " << name
+                         << " exceeds the policy for the queue but can't be released from memory as the queue is not durable");
+            }
         }
     }
     notify();