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 | 74249dc36ec625ffaac226d07e2b8483f2cdfc2c (patch) | |
| tree | 07d888fc1839c53022a46d923142cab64eef3505 /cpp | |
| parent | 47825e5553d36a327c95c28033df1d6a5111cf1c (diff) | |
| download | qpid-python-74249dc36ec625ffaac226d07e2b8483f2cdfc2c.tar.gz | |
QPID-6323: align default timeout behaviour with 0-10 codepath
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1653007 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/qpid/messaging/amqp/AddressHelper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/qpid/messaging/amqp/AddressHelper.cpp b/cpp/src/qpid/messaging/amqp/AddressHelper.cpp index e631501977..7f19ca7ec0 100644 --- a/cpp/src/qpid/messaging/amqp/AddressHelper.cpp +++ b/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) { |