summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Moravec <pmoravec@apache.org>2016-03-07 19:48:18 +0000
committerPavel Moravec <pmoravec@apache.org>2016-03-07 19:48:18 +0000
commit2386a3f4ed6131d2bf276ad00a2f524ee350f889 (patch)
tree6197ff2aa1ebed11b828ef7c40b1a4ce327dcb55
parent2e0f7a54279db2c5ae9cec0ccc04156b6855d1de (diff)
downloadqpid-python-2386a3f4ed6131d2bf276ad00a2f524ee350f889.tar.gz
QPID-7127: setting idle timeout to ffffffff fires ConnectionTicker with zero timeout
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1733966 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/cpp/src/qpid/broker/amqp/Connection.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/broker/amqp/Connection.cpp b/qpid/cpp/src/qpid/broker/amqp/Connection.cpp
index 2582877bb6..9a25e35e6d 100644
--- a/qpid/cpp/src/qpid/broker/amqp/Connection.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/Connection.cpp
@@ -335,7 +335,7 @@ void Connection::open()
uint32_t timeout = pn_transport_get_remote_idle_timeout(transport);
if (timeout) {
// if idle generate empty frames at 1/2 the timeout interval as keepalives:
- ticker = boost::intrusive_ptr<qpid::sys::TimerTask>(new ConnectionTickerTask((timeout+1)/2,
+ ticker = boost::intrusive_ptr<qpid::sys::TimerTask>(new ConnectionTickerTask((timeout/2)+1,
getBroker().getTimer(),
*this));
getBroker().getTimer().add(ticker);