From e82126bf9dc196ec0cbe19f990a9da98b5ab9508 Mon Sep 17 00:00:00 2001 From: Kenneth Anthony Giusti Date: Thu, 31 May 2012 14:11:14 +0000 Subject: QPID-4031: fix deadlock by moving timer cancel outside of scoped lock. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1344734 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/qpid/broker/Link.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'qpid/cpp/src') diff --git a/qpid/cpp/src/qpid/broker/Link.cpp b/qpid/cpp/src/qpid/broker/Link.cpp index e354b4e425..1f6e6ac856 100644 --- a/qpid/cpp/src/qpid/broker/Link.cpp +++ b/qpid/cpp/src/qpid/broker/Link.cpp @@ -377,6 +377,8 @@ void Link::closed(int, std::string text) void Link::destroy () { Bridges toDelete; + + timerTask->cancel(); // call prior to locking so maintenance visit can finish { Mutex::ScopedLock mutex(lock); @@ -395,9 +397,8 @@ void Link::destroy () for (Bridges::iterator i = created.begin(); i != created.end(); i++) toDelete.push_back(*i); created.clear(); - - timerTask->cancel(); } + // Now delete all bridges on this link (don't hold the lock for this). for (Bridges::iterator i = toDelete.begin(); i != toDelete.end(); i++) (*i)->close(); -- cgit v1.2.1