Author: aconway
Date: Fri Feb 17 14:11:46 2012
New Revision: 1245519
URL: http://svn.apache.org/viewvc?rev=1245519&view=rev
Log:
QPID-3603: Minor FIXME cleanup.
Modified:
qpid/branches/qpid-3603-7/qpid/cpp/src/qpid/ha/QueueReplicator.cpp
qpid/branches/qpid-3603-7/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp
Modified: qpid/branches/qpid-3603-7/qpid/cpp/src/qpid/ha/QueueReplicator.cpp
URL:
http://svn.apache.org/viewvc/qpid/branches/qpid-3603-7/qpid/cpp/src/qpid/ha/QueueReplicator.cpp?rev=1245519&r1=1245518&r2=1245519&view=diff
==============================================================================
--- qpid/branches/qpid-3603-7/qpid/cpp/src/qpid/ha/QueueReplicator.cpp
(original)
+++ qpid/branches/qpid-3603-7/qpid/cpp/src/qpid/ha/QueueReplicator.cpp Fri Feb
17 14:11:46 2012
@@ -114,7 +114,7 @@ void QueueReplicator::initializeBridge(B
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);
Modified:
qpid/branches/qpid-3603-7/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp
URL:
http://svn.apache.org/viewvc/qpid/branches/qpid-3603-7/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp?rev=1245519&r1=1245518&r2=1245519&view=diff
==============================================================================
--- qpid/branches/qpid-3603-7/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp
(original)
+++ qpid/branches/qpid-3603-7/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp
Fri Feb 17 14:11:46 2012
@@ -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<ReplicatingSubscription> 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);
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
