summaryrefslogtreecommitdiff
path: root/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2013-08-05 19:33:35 +0000
committerAlan Conway <aconway@apache.org>2013-08-05 19:33:35 +0000
commit8b4ce07e63b3ed12b43ae82fc487657c6e18f5e4 (patch)
tree7961e97040227d8253bb8cdc6bf7de11ec92d8de /qpid/cpp/src/qpid/ha/BrokerReplicator.cpp
parent866bf57249e41266cd713a5f73e3d18d216fad31 (diff)
downloadqpid-python-8b4ce07e63b3ed12b43ae82fc487657c6e18f5e4.tar.gz
QPID-4327: HA Handle brokers joining and leaving during a transaction.
During a transaction: - A broker leaving aborts the transaction. - A broker joining does not participate in the transaction - but does receive the results of the TX via normal replication. Clean up tx-queues when the transaction completes. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1510678 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/qpid/ha/BrokerReplicator.cpp')
-rw-r--r--qpid/cpp/src/qpid/ha/BrokerReplicator.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp b/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp
index 47860b433f..684f408c4b 100644
--- a/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp
+++ b/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp
@@ -793,7 +793,7 @@ void BrokerReplicator::deleteQueue(const std::string& name, bool purge) {
// messages. Any reroutes will be done at the primary and
// replicated as normal.
if (purge) queue->purge(0, boost::shared_ptr<Exchange>());
- broker.deleteQueue(name, userId, remoteHost);
+ haBroker.deleteQueue(name, remoteHost);
QPID_LOG(debug, logPrefix << "Queue deleted: " << name);
}
}