diff options
Diffstat (limited to 'qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp')
| -rw-r--r-- | qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp b/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp index ca4dd0099f..fb4cdd014c 100644 --- a/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp +++ b/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp @@ -24,7 +24,6 @@ #include "QueueGuard.h" #include "QueueSnapshot.h" #include "ReplicatingSubscription.h" -#include "TxReplicatingSubscription.h" #include "Primary.h" #include "HaBroker.h" #include "qpid/assert.h" @@ -52,7 +51,6 @@ const string ReplicatingSubscription::QPID_REPLICATING_SUBSCRIPTION(QPID_HA+"rep const string ReplicatingSubscription::QPID_BROKER_INFO(QPID_HA+"info"); const string ReplicatingSubscription::QPID_ID_SET(QPID_HA+"ids"); const string ReplicatingSubscription::QPID_QUEUE_REPLICATOR(QPID_HA+"qrep"); -const string ReplicatingSubscription::QPID_TX_REPLICATOR(QPID_HA+"txrep"); /* Called by SemanticState::consume to create a consumer */ boost::shared_ptr<broker::SemanticState::ConsumerImpl> @@ -76,12 +74,6 @@ ReplicatingSubscription::Factory::create( parent, name, queue, ack, acquire, exclusive, tag, resumeId, resumeTtl, arguments)); } - else if (type == QPID_TX_REPLICATOR) { - rs.reset(new TxReplicatingSubscription( - haBroker, - parent, name, queue, ack, acquire, exclusive, tag, - resumeId, resumeTtl, arguments)); - } if (rs) rs->initialize(); return rs; } @@ -254,7 +246,6 @@ void ReplicatingSubscription::cancel() cancelled = true; } QPID_LOG(debug, logPrefix << "Cancelled"); - if (primary) primary->removeReplica(*this); getQueue()->getObservers().remove( boost::dynamic_pointer_cast<ReplicatingSubscription>(shared_from_this())); guard->cancel(); @@ -280,8 +271,6 @@ void ReplicatingSubscription::acknowledged(const broker::DeliveryRecord& r) { void ReplicatingSubscription::sendDequeueEvent(Mutex::ScopedLock& l) { ReplicationIdSet oldDequeues = dequeues; - dequeues -= skipDequeue; // Don't send skipped dequeues - skipDequeue -= oldDequeues; // Forget dequeues that would have been sent. if (dequeues.empty()) return; QPID_LOG(trace, logPrefix << "Sending dequeues " << dequeues); sendEvent(DequeueEvent(dequeues), l); @@ -333,14 +322,4 @@ bool ReplicatingSubscription::doDispatch() } } -void ReplicatingSubscription::skipEnqueues(const ReplicationIdSet& ids) { - Mutex::ScopedLock l(lock); - skipEnqueue += ids; -} - -void ReplicatingSubscription::skipDequeues(const ReplicationIdSet& ids) { - Mutex::ScopedLock l(lock); - skipDequeue += ids; -} - }} // namespace qpid::ha |