Author: gsim
Date: Wed Dec 17 14:29:13 2014
New Revision: 1646255
URL: http://svn.apache.org/r1646255
Log:
QPID-5003: Use correct property for delayed auto-delete. Explicit 0 timeout
should override default.
Modified:
qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp?rev=1646255&r1=1646254&r2=1646255&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp
(original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp Wed Dec
17 14:29:13 2014
@@ -538,15 +538,16 @@ Subscription::Subscription(const Address
exclusiveSubscription((Opt(address)/LINK/X_SUBSCRIBE/EXCLUSIVE).asBool(exclusiveQueue)),
alternateExchange((Opt(address)/LINK/X_DECLARE/ALTERNATE_EXCHANGE).str())
{
- const Variant* timeout = (Opt(address)/LINK/TIMEOUT).value;
- if (timeout) {
+
+ if ((Opt(address)/LINK).hasKey(TIMEOUT)) {
+ const Variant* timeout = (Opt(address)/LINK/TIMEOUT).value;
if (timeout->asUint32())
queueOptions.setInt("qpid.auto_delete_timeout", timeout->asUint32());
} else if (durable && !(Opt(address)/LINK/RELIABILITY).value) {
//if durable but not explicitly reliable, then set a non-zero
//default for the autodelete timeout (previously this would
//have defaulted to autodelete immediately anyway, so the risk
//of the change causing problems is mitigated)
- queueOptions.setInt("qpid.auto_delete_delay", 15*60);
+ queueOptions.setInt("qpid.auto_delete_timeout", 15*60);
}
(Opt(address)/LINK/X_DECLARE/ARGUMENTS).collect(queueOptions);
(Opt(address)/LINK/X_SUBSCRIBE/ARGUMENTS).collect(subscriptionOptions);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
