Author: aconway
Date: Tue Jul 19 19:39:38 2011
New Revision: 1148499
URL: http://svn.apache.org/viewvc?rev=1148499&view=rev
Log:
NO-JIRA: Trivial code clean-up - LegacyLVQ to use isInBroker
Modified:
qpid/trunk/qpid/cpp/src/qpid/broker/LegacyLVQ.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/LegacyLVQ.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/LegacyLVQ.cpp?rev=1148499&r1=1148498&r2=1148499&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/LegacyLVQ.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/LegacyLVQ.cpp Tue Jul 19 19:39:38 2011
@@ -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);
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
