summaryrefslogtreecommitdiff
path: root/qpid/cpp
diff options
context:
space:
mode:
authorTed Ross <tross@apache.org>2009-05-20 15:32:57 +0000
committerTed Ross <tross@apache.org>2009-05-20 15:32:57 +0000
commitef68fd0d288a5908b2e9accf2b9eec7ba7fdd9b5 (patch)
tree2191482d91e44b49dbff7b4105e0910b1ec48a8a /qpid/cpp
parent858a8916b3dc877b4b9ecd3870d644d4438fb6a1 (diff)
downloadqpid-python-ef68fd0d288a5908b2e9accf2b9eec7ba7fdd9b5.tar.gz
QPID-1865 - Block the deletion of default exchanges.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@776734 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
-rw-r--r--qpid/cpp/src/qpid/broker/ExchangeRegistry.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/qpid/cpp/src/qpid/broker/ExchangeRegistry.cpp b/qpid/cpp/src/qpid/broker/ExchangeRegistry.cpp
index 59d516c089..8aa1008dbb 100644
--- a/qpid/cpp/src/qpid/broker/ExchangeRegistry.cpp
+++ b/qpid/cpp/src/qpid/broker/ExchangeRegistry.cpp
@@ -71,6 +71,11 @@ pair<Exchange::shared_ptr, bool> ExchangeRegistry::declare(const string& name, c
}
void ExchangeRegistry::destroy(const string& name){
+ if (name.empty() ||
+ (name.find("amq.") == 0 &&
+ (name == "amq.direct" || name == "amq.fanout" || name == "amq.topic" || name == "amq.match")) ||
+ name == "qpid.management")
+ throw framing::NotAllowedException(QPID_MSG("Cannot delete default exchange: '" << name << "'"));
RWlock::ScopedWlock locker(lock);
ExchangeMap::iterator i = exchanges.find(name);
if (i != exchanges.end()) {