Fix of the previous client heartbeat changes:

- Changes to the cluster code were previously missed
- It's neater and more correct to reset the traffic
  timeout for all connection traffic, not just traffic
  in a session


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

1 files changed, 5 insertions, 0 deletions

diff --git a/cpp/src/qpid/cluster/OutputInterceptor.cpp b/cpp/src/qpid/cluster/OutputInterceptor.cpp
index f898957351..b5fa595577 100644
--- a/cpp/src/qpid/cluster/OutputInterceptor.cpp
+++ b/cpp/src/qpid/cluster/OutputInterceptor.cpp
@@ -64,6 +64,11 @@ void OutputInterceptor::activateOutput() {
         sendDoOutput(sendMax);
 }
 
+void OutputInterceptor::abort() {
+    sys::Mutex::ScopedLock l(lock);
+    next->abort();
+}
+
 void OutputInterceptor::giveReadCredit(int32_t credit) {
     sys::Mutex::ScopedLock l(lock);
     next->giveReadCredit(credit);