summaryrefslogtreecommitdiff
path: root/qpid
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
commitfff763944c9bca13f6fcf2eed8c88ba30db8fdd0 (patch)
treeaacc4d221d11f571dd9ad74a27c0192e64212c76 /qpid
parent1204fd9d7b2657e47c9068ad7cb324648ab07e8c (diff)
downloadqpid-python-fff763944c9bca13f6fcf2eed8c88ba30db8fdd0.tar.gz
NO-JIRA: Trivial code clean-up - LegacyLVQ to use isInBroker
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1148499 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid')
-rw-r--r--qpid/cpp/src/qpid/broker/LegacyLVQ.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/qpid/cpp/src/qpid/broker/LegacyLVQ.cpp b/qpid/cpp/src/qpid/broker/LegacyLVQ.cpp
index a811a86492..3262e343a3 100644
--- a/qpid/cpp/src/qpid/broker/LegacyLVQ.cpp
+++ b/qpid/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);
}