summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/qpid/amqp_0_10/Map.cpp4
-rw-r--r--cpp/src/qpid/broker/SessionAdapter.cpp5
2 files changed, 5 insertions, 4 deletions
diff --git a/cpp/src/qpid/amqp_0_10/Map.cpp b/cpp/src/qpid/amqp_0_10/Map.cpp
index 480b439e40..eecd3eed7d 100644
--- a/cpp/src/qpid/amqp_0_10/Map.cpp
+++ b/cpp/src/qpid/amqp_0_10/Map.cpp
@@ -18,7 +18,7 @@
* under the License.
*
*/
-#include "qpid/amqp_0_10/specification.h" // for error constants.
+#include "qpid/amqp_0_10/exceptions.h"
#include "Map.h"
#include <ostream>
@@ -63,7 +63,7 @@ uint32_t Map::contentSize() const {
}
void Map::throwInvalidArg() {
- throw SessionException(execution::INVALID_ARGUMENT, "Invalid map encoding");
+ throw InvalidArgumentException("Invalid map encoding");
}
}} // namespace qpid::amqp_0_10
diff --git a/cpp/src/qpid/broker/SessionAdapter.cpp b/cpp/src/qpid/broker/SessionAdapter.cpp
index 3daf15f269..497f381807 100644
--- a/cpp/src/qpid/broker/SessionAdapter.cpp
+++ b/cpp/src/qpid/broker/SessionAdapter.cpp
@@ -24,6 +24,7 @@
#include "qpid/framing/reply_exceptions.h"
#include "qpid/framing/constants.h"
#include "qpid/log/Statement.h"
+#include "qpid/amqp_0_10/exceptions.h"
#include <boost/format.hpp>
#include <boost/cast.hpp>
#include <boost/bind.hpp>
@@ -574,11 +575,11 @@ void SessionAdapter::DtxHandlerImpl::setTimeout(const Xid010& xid,
Queue::shared_ptr SessionAdapter::HandlerHelper::getQueue(const string& name) const {
Queue::shared_ptr queue;
if (name.empty()) {
- throw SessionException(531, QPID_MSG("No queue name specified."));
+ throw amqp_0_10::IllegalArgumentException(QPID_MSG("No queue name specified."));
} else {
queue = session.getBroker().getQueues().find(name);
if (!queue)
- throw NotFoundException(QPID_MSG("Queue not found: "<<name));
+ throw amqp_0_10::NotFoundException(QPID_MSG("Queue not found: "<<name));
}
return queue;
}