diff options
| author | Gordon Sim <gsim@apache.org> | 2011-02-23 12:59:50 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2011-02-23 12:59:50 +0000 |
| commit | 7974cd1862b65c29eaa27d6e72317fb6d49ddb64 (patch) | |
| tree | aec8bfeacae962f2ca30e84a2ccbdac44a942e59 /cpp/src/qpid/broker/Broker.cpp | |
| parent | d3bdfcbb3e05304ba683c110730e4ee92b0f370f (diff) | |
| download | qpid-python-7974cd1862b65c29eaa27d6e72317fb6d49ddb64.tar.gz | |
QPID-3015: cleanup and additional test of acl enforcement
[Also modified acl unit test module to allow the policy file used to be configurable, making it easier to run standalone. Reset policy to allow all on tear down to allow repeated runs.]
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1073726 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/broker/Broker.cpp')
| -rw-r--r-- | cpp/src/qpid/broker/Broker.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp index c5662d763a..695a926f74 100644 --- a/cpp/src/qpid/broker/Broker.cpp +++ b/cpp/src/qpid/broker/Broker.cpp @@ -593,7 +593,7 @@ void Broker::createObject(const std::string& type, const std::string& name, } } else if (type == TYPE_EXCHANGE || type == TYPE_TOPIC) { bool durable(false); - std::string exchangeType; + std::string exchangeType("topic"); std::string alternateExchange; Variant::Map extensions; for (Variant::Map::const_iterator i = properties.begin(); i != properties.end(); ++i) { @@ -787,7 +787,7 @@ std::pair<boost::shared_ptr<Queue>, bool> Broker::createQueue( Exchange::shared_ptr alternate; if (!alternateExchange.empty()) { alternate = exchanges.get(alternateExchange); - if (!alternate) framing::NotFoundException(QPID_MSG("Alternate exchange does not exist: " << alternateExchange)); + if (!alternate) throw framing::NotFoundException(QPID_MSG("Alternate exchange does not exist: " << alternateExchange)); } std::pair<Queue::shared_ptr, bool> result = queues.declare(name, durable, autodelete, owner); @@ -859,7 +859,7 @@ std::pair<Exchange::shared_ptr, bool> Broker::createExchange( Exchange::shared_ptr alternate; if (!alternateExchange.empty()) { alternate = exchanges.get(alternateExchange); - if (!alternate) framing::NotFoundException(QPID_MSG("Alternate exchange does not exist: " << alternateExchange)); + if (!alternate) throw framing::NotFoundException(QPID_MSG("Alternate exchange does not exist: " << alternateExchange)); } std::pair<Exchange::shared_ptr, bool> result; |