Ensure that the ConnectionTimeoutTask does not block other tasks (e.g. ConnectionHeartbeatTask) by having the timeout changed after it has been submitted.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@785733 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 2 insertions, 1 deletions

diff --git a/cpp/src/qpid/broker/Connection.h b/cpp/src/qpid/broker/Connection.h
index db18c48d82..540f64a8ed 100644
--- a/cpp/src/qpid/broker/Connection.h
+++ b/cpp/src/qpid/broker/Connection.h
@@ -60,6 +60,7 @@ namespace broker {
 
 class LinkRegistry;
 class SecureConnection;
+struct ConnectionTimeoutTask;
 
 class Connection : public sys::ConnectionInputHandler,
                    public ConnectionState,
@@ -153,7 +154,7 @@ class Connection : public sys::ConnectionInputHandler,
     management::ManagementAgent* agent;
     Timer& timer;
     boost::intrusive_ptr<TimerTask> heartbeatTimer;
-    boost::intrusive_ptr<TimerTask> timeoutTimer;
+    boost::intrusive_ptr<ConnectionTimeoutTask> timeoutTimer;
     ErrorListener* errorListener;
     bool shadow;