summaryrefslogtreecommitdiff
path: root/cpp/src/qpid/ha/PrimaryTxObserver.cpp
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2013-09-09 17:08:23 +0000
committerAlan Conway <aconway@apache.org>2013-09-09 17:08:23 +0000
commitaf10ed6d7e3c0bc4d9b71bb04d77909591cd3eda (patch)
tree9442d848d0e95200344d6a1c3b5cda9ead5b3cba /cpp/src/qpid/ha/PrimaryTxObserver.cpp
parent1f971b1cb81c5f317733f4ad2d160f6373074b0b (diff)
downloadqpid-python-af10ed6d7e3c0bc4d9b71bb04d77909591cd3eda.tar.gz
QPID-4327: HA support for TX transactions - fix auth bugs.
- Set auth info on status check connections - Clean up status check loging - Use realm@username for authentication name (was using just username) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1521190 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/ha/PrimaryTxObserver.cpp')
-rw-r--r--cpp/src/qpid/ha/PrimaryTxObserver.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/qpid/ha/PrimaryTxObserver.cpp b/cpp/src/qpid/ha/PrimaryTxObserver.cpp
index 6a916d3f84..4c7dc2ef0d 100644
--- a/cpp/src/qpid/ha/PrimaryTxObserver.cpp
+++ b/cpp/src/qpid/ha/PrimaryTxObserver.cpp
@@ -169,7 +169,8 @@ void PrimaryTxObserver::rollback() {
void PrimaryTxObserver::end(sys::Mutex::ScopedLock&) {
// Don't destroy the tx-queue if there are connected subscriptions.
if (ended && unfinished.empty()) {
- haBroker.deleteQueue(txQueue->getName());
+ haBroker.getBroker().deleteQueue(
+ txQueue->getName(), haBroker.getUserId(), string());
broker.getExchanges().destroy(getExchangeName());
}
}