diff options
Diffstat (limited to 'cpp/lib/common/framing')
| -rw-r--r-- | cpp/lib/common/framing/AMQMethodBody.h | 2 | ||||
| -rw-r--r-- | cpp/lib/common/framing/Responder.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/cpp/lib/common/framing/AMQMethodBody.h b/cpp/lib/common/framing/AMQMethodBody.h index d9f028c786..b21ae379dc 100644 --- a/cpp/lib/common/framing/AMQMethodBody.h +++ b/cpp/lib/common/framing/AMQMethodBody.h @@ -53,8 +53,6 @@ class AMQMethodBody : public AMQBody virtual void invoke(AMQP_ServerOperations&, const MethodContext&); - // FIXME aconway 2007-01-24: remove match, use isA - bool match(AMQMethodBody* other) const; template <class T> bool isA() { return amqpClassId()==T::CLASS_ID && amqpMethodId()==T::METHOD_ID; } diff --git a/cpp/lib/common/framing/Responder.cpp b/cpp/lib/common/framing/Responder.cpp index 459b9bc8e4..c8c5ce8dcc 100644 --- a/cpp/lib/common/framing/Responder.cpp +++ b/cpp/lib/common/framing/Responder.cpp @@ -15,6 +15,7 @@ * limitations under the License. * */ +#include <boost/format.hpp> #include "Responder.h" #include "QpidError.h" @@ -25,15 +26,16 @@ namespace framing { Responder::Responder() : lastId(0), responseMark(0) {} void Responder::received(const AMQRequestBody::Data& request) { - // FIXME aconway 2007-01-22: Re-insert strict checking when all works. -// if (request.responseMark < responseMark || request.responseMark > lastId) -// THROW_QPID_ERROR(PROTOCOL_ERROR, "Invalid resposne mark"); + if (request.responseMark < responseMark || request.responseMark > lastId) + THROW_QPID_ERROR( + PROTOCOL_ERROR, boost::format("Invalid response mark %d.") + %request.responseMark); responseMark = request.responseMark; } void Responder::sending(AMQResponseBody::Data& response) { response.responseId = ++lastId; - // response.requestId should have been set by caller. + assert(response.requestId); // Should be already set. response.batchOffset = 0; } |