* Refactor: Moved major broker components (exchanges, queues etc.) from

  class SessionHandlerImplFactory to more logical class Broker.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-9@496425 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 3 insertions, 3 deletions

diff --git a/cpp/lib/common/framing/Responder.cpp b/cpp/lib/common/framing/Responder.cpp
index efe3609c7b..1fbbfb8542 100644
--- a/cpp/lib/common/framing/Responder.cpp
+++ b/cpp/lib/common/framing/Responder.cpp
@@ -30,9 +30,9 @@ void Responder::received(const AMQRequestBody::Data& request) {
     responseMark = request.responseMark;
 }
 
-void Responder::sending(AMQResponseBody::Data& response, RequestId toRequest) {
+void Responder::sending(AMQResponseBody::Data& response) {
     response.responseId = ++lastId;
-    response.requestId = toRequest;
+    // response.requestId should have been set by caller.
     response.batchOffset = 0;
 }
 
diff --git a/cpp/lib/common/framing/Responder.h b/cpp/lib/common/framing/Responder.h
index a11967acc1..0e1785256b 100644
--- a/cpp/lib/common/framing/Responder.h
+++ b/cpp/lib/common/framing/Responder.h
@@ -40,7 +40,7 @@ class Responder
     void received(const AMQRequestBody::Data& request);
 
     /** Called before sending a response to set respose data.  */
-    void sending(AMQResponseBody::Data& response, RequestId toRequest);
+    void sending(AMQResponseBody::Data& response);
 
     /** Get the ID of the highest response acknowledged by the peer. */
     ResponseId getResponseMark() { return responseMark; }