Fix to prevent possible Timer deadlocks by holding onto mutex while calling fire()

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

1 files changed, 1 insertions, 0 deletions

diff --git a/qpid/cpp/src/qpid/broker/Timer.cpp b/qpid/cpp/src/qpid/broker/Timer.cpp
index 9005a7cd6e..0b0d3ba63d 100644
--- a/qpid/cpp/src/qpid/broker/Timer.cpp
+++ b/qpid/cpp/src/qpid/broker/Timer.cpp
@@ -60,6 +60,7 @@ void Timer::run()
                 tasks.pop();
             } else if(t->time < AbsTime::now()) {
                 tasks.pop();
+                Monitor::ScopedUnlock u(monitor);
                 t->fire();
             } else {
                 monitor.wait(t->time);