Author: gsim
Date: Fri Jan 10 23:12:40 2014
New Revision: 1557280
URL: http://svn.apache.org/r1557280
Log:
QPID-5469: link should not override a topic policy specifying autodeletion
Modified:
qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Session.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Session.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Session.cpp?rev=1557280&r1=1557279&r2=1557280&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Session.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Session.cpp Fri Jan 10 23:12:40
2014
@@ -480,7 +480,8 @@ void Session::setupOutgoing(pn_link_t* l
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);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
