diff options
| author | Gordon Sim <gsim@apache.org> | 2015-02-09 21:49:43 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2015-02-09 21:49:43 +0000 |
| commit | 193aef453c4f0f9819c00f2437abb544cb7abed6 (patch) | |
| tree | 61ec42c330975e5931a08068e4b0fef46c0513d9 | |
| parent | ee17dbccdd6cf81d622efede3fa36230b70bdaa7 (diff) | |
| download | qpid-python-193aef453c4f0f9819c00f2437abb544cb7abed6.tar.gz | |
QPID-6324: refine previous fix such that no explicit reliability setting on durable subscription results in timeout by default
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1658581 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp b/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp index 0225ee74cb..ed931c90fb 100644 --- a/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp +++ b/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp @@ -548,8 +548,8 @@ Subscription::Subscription(const Address& address, const std::string& type) 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 && !reliable && !(Opt(address)/LINK/X_DECLARE).hasKey(AUTO_DELETE)) { - //if durable but not reliable, and auto-delete not + } else if (durable && !AddressResolution::is_reliable(address) && !(Opt(address)/LINK/X_DECLARE).hasKey(AUTO_DELETE)) { + //if durable, not explicitly 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); |