summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2011-07-19 19:39:38 +0000
committerAlan Conway <aconway@apache.org>2011-07-19 19:39:38 +0000
commit99a80aaed15489cde434c26cb5a951063d3f64a6 (patch)
treefbd91701c1b3939d47de564e0430da65730f7c53 /cpp/src
parent3a790e9155b8b2c0e547d57f11be83cc3eb5c366 (diff)
downloadqpid-python-99a80aaed15489cde434c26cb5a951063d3f64a6.tar.gz
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
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/qpid/broker/LegacyLVQ.cpp6
1 files changed, 1 insertions, 5 deletions
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);
}