summaryrefslogtreecommitdiff
path: root/cpp/lib/broker/SessionHandlerImpl.cpp
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2007-08-13 09:41:45 +0000
committerGordon Sim <gsim@apache.org>2007-08-13 09:41:45 +0000
commitf458ec7b59e6c03f59e8b33474bbe70f9a9873dc (patch)
tree5b750882fbaf54fe42ded428c76967f70ed55b3f /cpp/lib/broker/SessionHandlerImpl.cpp
parent2553b54071b2ab89faaf503e3c3c8449fed07070 (diff)
downloadqpid-python-f458ec7b59e6c03f59e8b33474bbe70f9a9873dc.tar.gz
Fixes for QPID-544 and QPID-548
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@565284 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/lib/broker/SessionHandlerImpl.cpp')
-rw-r--r--cpp/lib/broker/SessionHandlerImpl.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/lib/broker/SessionHandlerImpl.cpp b/cpp/lib/broker/SessionHandlerImpl.cpp
index b91bee5a4b..0bea721175 100644
--- a/cpp/lib/broker/SessionHandlerImpl.cpp
+++ b/cpp/lib/broker/SessionHandlerImpl.cpp
@@ -298,7 +298,6 @@ void SessionHandlerImpl::QueueHandlerImpl::declare(u_int16_t channel, u_int16_t
queue = queue_created.first;
assert(queue);
if (queue_created.second) { // This is a new queue
- parent->getChannel(channel)->setDefaultQueue(queue);
//apply settings & create persistent record if required
queue_created.first->create(arguments);
@@ -315,6 +314,7 @@ void SessionHandlerImpl::QueueHandlerImpl::declare(u_int16_t channel, u_int16_t
if (exclusive && !queue->isExclusiveOwner(parent)) {
throw ChannelException(405, "Cannot grant exclusive access to queue");
}
+ parent->getChannel(channel)->setDefaultQueue(queue);
if (!nowait) {
string queueName = queue->getName();
parent->client->getQueue().declareOk(channel, queueName, queue->getMessageCount(), queue->getConsumerCount());