diff options
| author | Gordon Sim <gsim@apache.org> | 2015-01-19 14:13:06 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2015-01-19 14:13:06 +0000 |
| commit | cd68c04d70cd93d01feec3ae5e034f497f88823d (patch) | |
| tree | 2d2dfa8b4755fb113e1e5b7a726ab6c5f4dc954f /qpid/cpp/src | |
| parent | d4b6143a73d60d3ade9b398b8d45c3ba495bc6ec (diff) | |
| download | qpid-python-cd68c04d70cd93d01feec3ae5e034f497f88823d.tar.gz | |
QPID-6323: align default timeout behaviour with 0-10 codepath
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1653007 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp b/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp index e631501977..7f19ca7ec0 100644 --- a/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp +++ b/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp @@ -267,7 +267,7 @@ AddressHelper::AddressHelper(const Address& address) : bind(link, RELIABILITY, reliability); durableNode = test(node, DURABLE); durableLink = test(link, DURABLE); - timeout = get(link, TIMEOUT, durableLink ? DEFAULT_DURABLE_TIMEOUT : DEFAULT_TIMEOUT); + timeout = get(link, TIMEOUT, durableLink && reliability != AT_LEAST_ONCE ? DEFAULT_DURABLE_TIMEOUT : DEFAULT_TIMEOUT); std::string mode; if (bind(address, MODE, mode)) { if (mode == BROWSE) { |