summaryrefslogtreecommitdiff
path: root/qpid/cpp/src
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2013-09-09 17:08:30 +0000
committerAlan Conway <aconway@apache.org>2013-09-09 17:08:30 +0000
commiteb985ca06c420450dfe04bf1e15124053d819e4b (patch)
treec20454768fa01ce79fc4546e89842bd170c6b1a8 /qpid/cpp/src
parentfcafb84f19127b245394f311e4f3ed47180a5188 (diff)
downloadqpid-python-eb985ca06c420450dfe04bf1e15124053d819e4b.tar.gz
QPID-4327: HA support for TX transactions - consistent use of QueueRegistry::get
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1521191 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
-rw-r--r--qpid/cpp/src/qpid/broker/SemanticState.cpp4
-rw-r--r--qpid/cpp/src/qpid/broker/SessionAdapter.cpp4
2 files changed, 2 insertions, 6 deletions
diff --git a/qpid/cpp/src/qpid/broker/SemanticState.cpp b/qpid/cpp/src/qpid/broker/SemanticState.cpp
index 3ba01de004..18c29c09f9 100644
--- a/qpid/cpp/src/qpid/broker/SemanticState.cpp
+++ b/qpid/cpp/src/qpid/broker/SemanticState.cpp
@@ -665,9 +665,7 @@ Queue::shared_ptr SemanticState::getQueue(const string& name) const {
if (name.empty()) {
throw NotAllowedException(QPID_MSG("No queue name specified."));
} else {
- queue = session.getBroker().getQueues().find(name);
- if (!queue)
- throw NotFoundException(QPID_MSG("Queue not found: "<<name));
+ queue = session.getBroker().getQueues().get(name);
}
return queue;
}
diff --git a/qpid/cpp/src/qpid/broker/SessionAdapter.cpp b/qpid/cpp/src/qpid/broker/SessionAdapter.cpp
index 0124e88832..64e3fe1b8a 100644
--- a/qpid/cpp/src/qpid/broker/SessionAdapter.cpp
+++ b/qpid/cpp/src/qpid/broker/SessionAdapter.cpp
@@ -685,9 +685,7 @@ Queue::shared_ptr SessionAdapter::HandlerHelper::getQueue(const string& name) co
if (name.empty()) {
throw framing::IllegalArgumentException(QPID_MSG("No queue name specified."));
} else {
- queue = session.getBroker().getQueues().find(name);
- if (!queue)
- throw framing::NotFoundException(QPID_MSG("Queue not found: "<<name));
+ queue = session.getBroker().getQueues().get(name);
}
return queue;
}