From 99a80aaed15489cde434c26cb5a951063d3f64a6 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Tue, 19 Jul 2011 19:39:38 +0000 Subject: NO-JIRA: Trivial code clean-up - LegacyLVQ to use isInBroker git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1148499 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/broker/LegacyLVQ.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'cpp/src') diff --git a/cpp/src/qpid/broker/LegacyLVQ.cpp b/cpp/src/qpid/broker/LegacyLVQ.cpp index a811a86492..3262e343a3 100644 --- a/cpp/src/qpid/broker/LegacyLVQ.cpp +++ b/cpp/src/qpid/broker/LegacyLVQ.cpp @@ -93,11 +93,7 @@ void LegacyLVQ::removeIf(Predicate p) //purging of an LVQ is not enabled if the broker is clustered //(expired messages will be removed on delivery and consolidated //by key as part of normal LVQ operation). - - //TODO: Is there a neater way to check whether broker is - //clustered? Here we assume that if the clustered timer is the - //same as the regular timer, we are not clustered: - if (!broker || &(broker->getClusterTimer()) == &(broker->getTimer())) + if (!broker || !broker->isInCluster()) MessageMap::removeIf(p); } -- cgit v1.2.1