You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gs...@apache.org on 2015/01/19 15:13:17 UTC
svn commit: r1653009 -
/qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp
Author: gsim
Date: Mon Jan 19 14:13:17 2015
New Revision: 1653009
URL: http://svn.apache.org/r1653009
Log:
QPID-6324: fix when default timeout applies
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=1653009&r1=1653008&r2=1653009&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 Mon Jan 19 14:13:17 2015
@@ -542,11 +542,10 @@ Subscription::Subscription(const Address
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)
+ } else if (durable && !reliable && !(Opt(address)/LINK/X_DECLARE).hasKey(AUTO_DELETE)) {
+ //if durable but not reliable, and auto-delete not
+ //explicitly set, then set a non-zero default for the
+ //autodelete timeout
queueOptions.setInt("qpid.auto_delete_timeout", 2*60);
}
(Opt(address)/LINK/X_DECLARE/ARGUMENTS).collect(queueOptions);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org