diff options
| author | Gordon Sim <gsim@apache.org> | 2014-01-10 23:12:40 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2014-01-10 23:12:40 +0000 |
| commit | 1e79cf41b85c08c8106edd8be410e3cc6cebf328 (patch) | |
| tree | a1e396e4d0284100edcc6fee72c83ebd2e545699 | |
| parent | 348b3e48dcf25a61c16915ebc7a8649f9c84b65e (diff) | |
| download | qpid-python-1e79cf41b85c08c8106edd8be410e3cc6cebf328.tar.gz | |
QPID-5469: link should not override a topic policy specifying autodeletion
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1557280 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/src/qpid/broker/amqp/Session.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/broker/amqp/Session.cpp b/qpid/cpp/src/qpid/broker/amqp/Session.cpp index 537912ea83..1749725047 100644 --- a/qpid/cpp/src/qpid/broker/amqp/Session.cpp +++ b/qpid/cpp/src/qpid/broker/amqp/Session.cpp @@ -480,7 +480,8 @@ void Session::setupOutgoing(pn_link_t* link, pn_terminus_t* source, const std::s if (node.topic) { settings = node.topic->getPolicy(); settings.durable = durable; - settings.autodelete = autodelete; + //only determine autodelete from link details if the policy did not imply autodeletion + if (!settings.autodelete) settings.autodelete = autodelete; altExchange = node.topic->getAlternateExchange(); } settings.autoDeleteDelay = pn_terminus_get_timeout(source); |