From cddbd5b6a4e8f6077c159ce1ebb34b65fad7a108 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Fri, 17 Feb 2012 14:11:46 +0000 Subject: QPID-3603: Minor FIXME cleanup. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid-3603-7@1245519 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/qpid/ha/QueueReplicator.cpp | 2 +- qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/qpid/cpp/src/qpid/ha/QueueReplicator.cpp b/qpid/cpp/src/qpid/ha/QueueReplicator.cpp index 0169d0da5b..0017cc82cd 100644 --- a/qpid/cpp/src/qpid/ha/QueueReplicator.cpp +++ b/qpid/cpp/src/qpid/ha/QueueReplicator.cpp @@ -114,7 +114,7 @@ void QueueReplicator::initializeBridge(Bridge& bridge, SessionHandler& sessionHa settings.setInt(ReplicatingSubscription::QPID_REPLICATING_SUBSCRIPTION, 1); // TODO aconway 2011-12-19: optimize. settings.setInt(QPID_SYNC_FREQUENCY, 1); - peer.getMessage().subscribe(args.i_src, args.i_dest, 0/*accept-explicit*/, 1/*not-acquired*/, false, "", 0, settings); + peer.getMessage().subscribe(args.i_src, args.i_dest, 0/*accept-explicit*/, 1/*not-acquired*/, false/*exclusive*/, "", 0, settings); peer.getMessage().flow(getName(), 0, 0xFFFFFFFF); peer.getMessage().flow(getName(), 1, 0xFFFFFFFF); QPID_LOG(debug, logPrefix << "Activated bridge " << bridgeName); diff --git a/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp b/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp index 33948f2d7e..e8571cf871 100644 --- a/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp +++ b/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp @@ -54,7 +54,7 @@ ReplicatingSubscription::Factory::create( const string& name, Queue::shared_ptr queue, bool ack, - bool /*acquire*/, + bool acquire, bool exclusive, const string& tag, const string& resumeId, @@ -63,10 +63,8 @@ ReplicatingSubscription::Factory::create( ) { boost::shared_ptr rs; if (arguments.isSet(QPID_REPLICATING_SUBSCRIPTION)) { - // FIXME aconway 2011-12-01: ignoring acquire param and setting acquire - // false. Should this be done in the caller? Remove from ctor parameters. rs.reset(new ReplicatingSubscription( - parent, name, queue, ack, false, exclusive, tag, + parent, name, queue, ack, acquire, exclusive, tag, resumeId, resumeTtl, arguments)); queue->addObserver(rs); } -- cgit v1.2.1