diff options
author | Gordon Sim <gsim@apache.org> | 2014-01-10 21:16:56 +0000 |
---|---|---|
committer | Gordon Sim <gsim@apache.org> | 2014-01-10 21:16:56 +0000 |
commit | 1ff021ef3b7db9a1b552bffa12603a61154fa3c5 (patch) | |
tree | 5694ac31205ab770517cd76e71fe4d0363dd246f | |
parent | 9197c14400b64ef42ebb9009f25b59eb765304f5 (diff) | |
download | qpid-python-1ff021ef3b7db9a1b552bffa12603a61154fa3c5.tar.gz |
QPID-5463: make dynamic nodes auto deleted by default
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1557262 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | qpid/cpp/src/qpid/broker/amqp/NodeProperties.cpp | 7 | ||||
-rw-r--r-- | qpid/cpp/src/qpid/broker/amqp/NodeProperties.h | 3 | ||||
-rw-r--r-- | qpid/cpp/src/qpid/broker/amqp/Session.cpp | 2 | ||||
-rw-r--r-- | qpid/cpp/src/qpid/broker/amqp/Session.h | 1 |
4 files changed, 9 insertions, 4 deletions
diff --git a/qpid/cpp/src/qpid/broker/amqp/NodeProperties.cpp b/qpid/cpp/src/qpid/broker/amqp/NodeProperties.cpp index 2072eb35b9..3d63d4c8c1 100644 --- a/qpid/cpp/src/qpid/broker/amqp/NodeProperties.cpp +++ b/qpid/cpp/src/qpid/broker/amqp/NodeProperties.cpp @@ -105,7 +105,8 @@ bool getLifetimeDescriptorSymbol(QueueSettings::LifetimePolicy policy, pn_bytes_ } -NodeProperties::NodeProperties() : received(false), queue(true), durable(false), autoDelete(false), exclusive(false), exchangeType("topic"), lifetime(QueueSettings::DELETE_IF_UNUSED) {} +NodeProperties::NodeProperties(bool isDynamic) : received(false), queue(true), durable(false), autoDelete(false), exclusive(false), + dynamic(isDynamic), exchangeType("topic"), lifetime(QueueSettings::DELETE_IF_UNUSED) {} void NodeProperties::read(pn_data_t* data) { @@ -335,7 +336,9 @@ void NodeProperties::onSymbolValue(const CharSequence& key, const CharSequence& QueueSettings NodeProperties::getQueueSettings() { - QueueSettings settings(durable, autoDelete); + //assume autodelete for dynamic nodes unless explicitly requested + //otherwise or unless durability is requested + QueueSettings settings(durable, autoDelete || (dynamic && !wasSpecified(AUTO_DELETE) && !durable)); qpid::types::Variant::Map unused; settings.populate(properties, unused); settings.lifetime = lifetime; diff --git a/qpid/cpp/src/qpid/broker/amqp/NodeProperties.h b/qpid/cpp/src/qpid/broker/amqp/NodeProperties.h index 414ca3f1e8..45a3533cf4 100644 --- a/qpid/cpp/src/qpid/broker/amqp/NodeProperties.h +++ b/qpid/cpp/src/qpid/broker/amqp/NodeProperties.h @@ -38,7 +38,7 @@ namespace amqp { class NodeProperties : public qpid::amqp::MapReader { public: - NodeProperties(); + NodeProperties(bool isDynamic); void read(pn_data_t*); void write(pn_data_t*,boost::shared_ptr<Queue>); void write(pn_data_t*,boost::shared_ptr<Exchange>); @@ -75,6 +75,7 @@ class NodeProperties : public qpid::amqp::MapReader bool durable; bool autoDelete; bool exclusive; + bool dynamic; std::string exchangeType; std::string alternateExchange; qpid::types::Variant::Map properties; diff --git a/qpid/cpp/src/qpid/broker/amqp/Session.cpp b/qpid/cpp/src/qpid/broker/amqp/Session.cpp index 2c4c9a6183..537eb09c6b 100644 --- a/qpid/cpp/src/qpid/broker/amqp/Session.cpp +++ b/qpid/cpp/src/qpid/broker/amqp/Session.cpp @@ -216,7 +216,7 @@ Session::ResolvedNode Session::resolve(const std::string name, pn_terminus_t* te } //check whether user is even allowed access to queues/topics before resolving authorise.access(name, isQueueRequested, isTopicRequested); - ResolvedNode node; + ResolvedNode node(pn_terminus_is_dynamic(terminus)); if (isTopicRequested || !isQueueRequested) { node.topic = connection.getTopics().get(name); if (node.topic) node.exchange = node.topic->getExchange(); diff --git a/qpid/cpp/src/qpid/broker/amqp/Session.h b/qpid/cpp/src/qpid/broker/amqp/Session.h index a991ac9e3e..1d9c2d161d 100644 --- a/qpid/cpp/src/qpid/broker/amqp/Session.h +++ b/qpid/cpp/src/qpid/broker/amqp/Session.h @@ -100,6 +100,7 @@ class Session : public ManagedSession, public boost::enable_shared_from_this<Ses boost::shared_ptr<qpid::broker::amqp::Topic> topic; boost::shared_ptr<Relay> relay; NodeProperties properties; + ResolvedNode(bool isDynamic) : properties(isDynamic) {} }; ResolvedNode resolve(const std::string name, pn_terminus_t* terminus, bool incoming); |