From b5c270f10496f522ef6a03a8fa60f85d55c9187d Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Fri, 2 Feb 2007 22:03:10 +0000 Subject: * cpp/lib/common/framing/MethodContext.h: Reduced MethodContext to ChannelAdapter and Method Body. Request ID comes from body, ChannelAdapter is used to send frames, not OutputHandler. * cpp/lib/common/framing/ChannelAdapter.h,.cpp: Removed context member. Context is per-method not per-channel. * cpp/lib/broker/*: Replace direct use of OutputHandler and ChannelId with MethodContext (for responses) or ChannelAdapter (for requests.) Use context request-ID to construct responses, send all bodies via ChannelAdapter. * cpp/lib/broker/BrokerAdapter.cpp: Link broker::Channel to BrokerAdapter. * cpp/lib/broker/*: Remove unnecessary ProtocolVersion parameters. Fix bogus signatures: ProtocolVersion* -> const ProtocolVersion& * Cosmetic changes, many files: - fixed indentation, broke long lines. - removed unnecessary qpid:: prefixes. * broker/BrokerAdapter,BrokerChannel: Merged BrokerAdapter into broker::channel. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-9@502767 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/lib/client/ResponseHandler.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'cpp/lib/client/ResponseHandler.cpp') diff --git a/cpp/lib/client/ResponseHandler.cpp b/cpp/lib/client/ResponseHandler.cpp index ea234ac321..ea48fa2386 100644 --- a/cpp/lib/client/ResponseHandler.cpp +++ b/cpp/lib/client/ResponseHandler.cpp @@ -63,7 +63,7 @@ void ResponseHandler::receive(ClassId c, MethodId m) { THROW_QPID_ERROR( PROTOCOL_ERROR, "Channel closed unexpectedly."); } - if(!validate(response->amqpClassId(), response->amqpMethodId())) { + if(!validate(response->amqpClassId(), response->amqpMethodId())) { THROW_QPID_ERROR( PROTOCOL_ERROR, boost::format("Expected class:method %d:%d, got %d:%d") @@ -71,6 +71,10 @@ void ResponseHandler::receive(ClassId c, MethodId m) { } } +RequestId ResponseHandler::getRequestId() { + assert(response->getRequestId()); + return response->getRequestId(); +} void ResponseHandler::expect(){ waiting = true; } -- cgit v1.2.1