From 381ff27cacc1f72a42504e8e698d33b59d145b30 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Fri, 26 Feb 2010 16:47:23 +0000 Subject: Fix cluster abort on shutdown in ClusterTimer::fire. The cluster destructor was not deleting the ClusterTimer set on the broker, so this timer had a dangling pointer to the cluster. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@916751 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/sys/AggregateOutput.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'cpp/src/qpid/sys/AggregateOutput.cpp') diff --git a/cpp/src/qpid/sys/AggregateOutput.cpp b/cpp/src/qpid/sys/AggregateOutput.cpp index 4f0a4fa5af..fc95f46fb9 100644 --- a/cpp/src/qpid/sys/AggregateOutput.cpp +++ b/cpp/src/qpid/sys/AggregateOutput.cpp @@ -34,6 +34,7 @@ void AggregateOutput::activateOutput() { control.activateOutput(); } void AggregateOutput::giveReadCredit(int32_t credit) { control.giveReadCredit(credit); } +namespace { // Clear the busy flag and notify waiting threads in destructor. struct ScopedBusy { bool& flag; @@ -41,7 +42,8 @@ struct ScopedBusy { ScopedBusy(bool& f, Monitor& m) : flag(f), monitor(m) { f = true; } ~ScopedBusy() { flag = false; monitor.notifyAll(); } }; - +} + bool AggregateOutput::doOutput() { Mutex::ScopedLock l(lock); ScopedBusy sb(busy, lock); -- cgit v1.2.1