diff options
| author | Alan Conway <aconway@apache.org> | 2009-03-05 20:24:41 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2009-03-05 20:24:41 +0000 |
| commit | 5f9b4a56232ad922d3e25a408924cb5bef0036d8 (patch) | |
| tree | 60f2884f112278156a00d0dc806246eccfe8d214 /cpp/src/qpid/cluster/ExpiryPolicy.cpp | |
| parent | 97d5254a47121a42d435e1ca808cb4c56cdbf18f (diff) | |
| download | qpid-python-5f9b4a56232ad922d3e25a408924cb5bef0036d8.tar.gz | |
Cluster: restore separate event/frame threads.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@750574 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/cluster/ExpiryPolicy.cpp')
| -rw-r--r-- | cpp/src/qpid/cluster/ExpiryPolicy.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cpp/src/qpid/cluster/ExpiryPolicy.cpp b/cpp/src/qpid/cluster/ExpiryPolicy.cpp index 690acfc3ad..cc451bf661 100644 --- a/cpp/src/qpid/cluster/ExpiryPolicy.cpp +++ b/cpp/src/qpid/cluster/ExpiryPolicy.cpp @@ -30,8 +30,8 @@ namespace qpid { namespace cluster { -ExpiryPolicy::ExpiryPolicy(const boost::function<bool()> & f, Multicaster& m, const MemberId& id, broker::Timer& t) - : expiredPolicy(new Expired), isLeader(f), mcast(m), memberId(id), timer(t) {} +ExpiryPolicy::ExpiryPolicy(Multicaster& m, const MemberId& id, broker::Timer& t) + : expiredPolicy(new Expired), mcast(m), memberId(id), timer(t) {} namespace { uint64_t clusterId(const broker::Message& m) { @@ -65,8 +65,7 @@ bool ExpiryPolicy::hasExpired(broker::Message& m) { void ExpiryPolicy::sendExpire(uint64_t id) { sys::Mutex::ScopedLock l(lock); - if (isLeader()) - mcast.mcastControl(framing::ClusterMessageExpiredBody(framing::ProtocolVersion(), id), memberId); + mcast.mcastControl(framing::ClusterMessageExpiredBody(framing::ProtocolVersion(), id), memberId); } void ExpiryPolicy::deliverExpire(uint64_t id) { |