From a1eaf3a3abf8fc22a235b4ca1ce902be2834b3d9 Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Wed, 11 Aug 2010 10:06:24 +0000 Subject: Revert commits r981517 and r981435 that moved periodic purging of queues onto cluster's timer. If the timer fires during an update it causes errors; it also puts a potentially time consuming task on the clusters dispatch thread. Instead don't purge LVQs to avoid cluster inconsistencies (and more directly the assertion that aims to prevent these). git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@984357 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/broker/Broker.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'cpp/src/qpid/broker/Broker.cpp') diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp index 5e0ca90e69..1a8bed1be0 100644 --- a/cpp/src/qpid/broker/Broker.cpp +++ b/cpp/src/qpid/broker/Broker.cpp @@ -156,7 +156,7 @@ Broker::Broker(const Broker::Options& conf) : conf.replayFlushLimit*1024, // convert kb to bytes. conf.replayHardLimit*1024), *this), - queueCleaner(queues, &timer), + queueCleaner(queues, timer), queueEvents(poller,!conf.asyncQueueEvents), recovery(true), clusterUpdatee(false), @@ -504,7 +504,6 @@ bool Broker::deferDeliveryImpl(const std::string& , void Broker::setClusterTimer(std::auto_ptr t) { clusterTimer = t; - queueCleaner.setTimer(clusterTimer.get()); } const std::string Broker::TCP_TRANSPORT("tcp"); -- cgit v1.2.1