Author: gsim
Date: Wed Jun 25 10:17:18 2014
New Revision: 1605320
URL: http://svn.apache.org/r1605320
Log:
QPID-5845: topic policy's auto delete delay should not be overridden by link
specific timeout
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=1605320&r1=1605319&r2=1605320&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Session.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Session.cpp Wed Jun 25 10:17:18
2014
@@ -486,10 +486,13 @@ void Session::setupOutgoing(pn_link_t* l
if (!settings.autodelete) settings.autodelete = autodelete;
altExchange = node.topic->getAlternateExchange();
}
- settings.autoDeleteDelay = pn_terminus_get_timeout(source);
+ if (!settings.autoDeleteDelay) {
+ //only use delay from link if policy didn't specify one
+ settings.autoDeleteDelay = pn_terminus_get_timeout(source);
+ settings.original["qpid.auto_delete_timeout"] =
settings.autoDeleteDelay;
+ }
if (settings.autoDeleteDelay) {
settings.autodelete = true;
- settings.original["qpid.auto_delete_timeout"] =
settings.autoDeleteDelay;
}
filter.configure(settings);
std::stringstream queueName;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
