diff options
| author | Ted Ross <tross@apache.org> | 2009-05-20 15:32:57 +0000 |
|---|---|---|
| committer | Ted Ross <tross@apache.org> | 2009-05-20 15:32:57 +0000 |
| commit | 2ee35df0444e52ba7e24d8817110adbeaacb9e52 (patch) | |
| tree | bda43ac75283cbfdaf72a1ef585d7f6e96743141 | |
| parent | a2c01a4f2dc35aab8b905ad7efb5c62305e6d48b (diff) | |
| download | qpid-python-2ee35df0444e52ba7e24d8817110adbeaacb9e52.tar.gz | |
QPID-1865 - Block the deletion of default exchanges.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@776734 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | cpp/src/qpid/broker/ExchangeRegistry.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cpp/src/qpid/broker/ExchangeRegistry.cpp b/cpp/src/qpid/broker/ExchangeRegistry.cpp index 59d516c089..8aa1008dbb 100644 --- a/cpp/src/qpid/broker/ExchangeRegistry.cpp +++ b/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()) { |