From ee187c3e89ddaea3ced38b6d9928cb29fac5b268 Mon Sep 17 00:00:00 2001
From: Gordon Sim <gsim@apache.org>
Date: Thu, 8 Aug 2013 12:58:23 +0000
Subject: QPID-5054: check whether topic actually exists in delete request

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1511762 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/cpp/src/qpid/broker/amqp/Topic.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'qpid/cpp')

diff --git a/qpid/cpp/src/qpid/broker/amqp/Topic.cpp b/qpid/cpp/src/qpid/broker/amqp/Topic.cpp
index 7d77343f26..77561d1111 100644
--- a/qpid/cpp/src/qpid/broker/amqp/Topic.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/Topic.cpp
@@ -117,8 +117,12 @@ bool TopicRegistry::deleteObject(Broker& broker, const std::string& type, const
 {
     if (type == TOPIC) {
         boost::shared_ptr<Topic> topic = remove(name);
-        if (topic->isDurable()) broker.getStore().destroy(*topic);
-        return true;
+        if (topic) {
+            if (topic->isDurable()) broker.getStore().destroy(*topic);
+            return true;
+        } else {
+            return false;
+        }
     } else {
         return false;
     }
-- 
cgit v1.2.1