From 0d9a9a82bc754e8ee12c5b7b4c8befd7b5b5c12b Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Mon, 8 Jun 2009 16:43:28 +0000 Subject: 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 --- cpp/src/qpid/broker/Connection.cpp | 3 +++ cpp/src/qpid/broker/ConnectionHandler.cpp | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'cpp/src/qpid/broker') diff --git a/cpp/src/qpid/broker/Connection.cpp b/cpp/src/qpid/broker/Connection.cpp index c53d943e98..c21fd49171 100644 --- a/cpp/src/qpid/broker/Connection.cpp +++ b/cpp/src/qpid/broker/Connection.cpp @@ -103,6 +103,9 @@ Connection::~Connection() } void Connection::received(framing::AMQFrame& frame) { + // Received frame on connection so delay timeout + restartTimeout(); + if (frame.getChannel() == 0 && frame.getMethod()) { adapter.handle(frame); } else { diff --git a/cpp/src/qpid/broker/ConnectionHandler.cpp b/cpp/src/qpid/broker/ConnectionHandler.cpp index d3e795ae06..1d6c4c9ad8 100644 --- a/cpp/src/qpid/broker/ConnectionHandler.cpp +++ b/cpp/src/qpid/broker/ConnectionHandler.cpp @@ -63,9 +63,6 @@ void ConnectionHandler::heartbeat() void ConnectionHandler::handle(framing::AMQFrame& frame) { - // Received frame on connection so delay timeout - handler->connection.restartTimeout(); - AMQMethodBody* method=frame.getBody()->getMethod(); Connection::ErrorListener* errorListener = handler->connection.getErrorListener(); try{ -- cgit v1.2.1