Author: astitcher
Date: Tue Jun 23 20:02:24 2009
New Revision: 787811
URL: http://svn.apache.org/viewvc?rev=787811&view=rev
Log:
Once we're aborting the connection due to traffic timeout make sure
we cancel heartbeats
Modified:
qpid/trunk/qpid/cpp/src/qpid/broker/Connection.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Connection.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Connection.cpp?rev=787811&r1=787810&r2=787811&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Connection.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Connection.cpp Tue Jun 23 20:02:24 2009
@@ -52,7 +52,7 @@
Timer& timer;
Connection& connection;
AbsTime expires;
-
+
ConnectionTimeoutTask(uint16_t hb, Timer& t, Connection& c) :
TimerTask(Duration(hb*2*TIME_SEC)),
timer(t),
@@ -359,6 +359,11 @@
void Connection::abort()
{
+ // Make sure that we don't try to send a heartbeat as we're
+ // aborting the connection
+ if (heartbeatTimer)
+ heartbeatTimer->cancel();
+
out.abort();
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
