* Fixed request-response correlation on the broker.

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

4 files changed, 7 insertions, 5 deletions

diff --git a/cpp/lib/broker/Connection.cpp b/cpp/lib/broker/Connection.cpp
index dc8bdeda05..84bd23b2a7 100644
--- a/cpp/lib/broker/Connection.cpp
+++ b/cpp/lib/broker/Connection.cpp
@@ -74,7 +74,7 @@ void Connection::initiated(qpid::framing::ProtocolInitiation* header) {
     string locales("en_US");
     // TODO aconway 2007-01-16: Client call, move to adapter.
     client->getConnection().start(
-        MethodContext(0, out),
+        MethodContext(0, &getAdapter(0)),
         header->getMajor(), header->getMinor(),
         properties, mechanisms, locales);
 }
diff --git a/cpp/lib/broker/ConnectionFactory.h b/cpp/lib/broker/ConnectionFactory.h
index b699dd0af4..9147384b2a 100644
--- a/cpp/lib/broker/ConnectionFactory.h
+++ b/cpp/lib/broker/ConnectionFactory.h
@@ -32,7 +32,8 @@ class ConnectionFactory : public qpid::sys::ConnectionInputHandlerFactory
   public:
     ConnectionFactory(Broker& b);
             
-    virtual qpid::sys::ConnectionInputHandler* create(qpid::sys::ConnectionOutputHandler* ctxt);
+    virtual qpid::sys::ConnectionInputHandler* create(
+        qpid::sys::ConnectionOutputHandler* ctxt);
             
     virtual ~ConnectionFactory();
 
diff --git a/cpp/lib/common/framing/ChannelAdapter.cpp b/cpp/lib/common/framing/ChannelAdapter.cpp
index cf6fea1455..7685240826 100644
--- a/cpp/lib/common/framing/ChannelAdapter.cpp
+++ b/cpp/lib/common/framing/ChannelAdapter.cpp
@@ -43,7 +43,7 @@ void ChannelAdapter::send(AMQFrame* frame) {
 
 void ChannelAdapter::handleRequest(AMQRequestBody::shared_ptr request) {
     responder.received(request->getData());
-    MethodContext context(id, &out, request->getRequestId());
+    MethodContext context(id, this, request->getRequestId());
     handleMethodInContext(request, context);
 }
 
diff --git a/cpp/lib/common/framing/Responder.cpp b/cpp/lib/common/framing/Responder.cpp
index 1fbbfb8542..459b9bc8e4 100644
--- a/cpp/lib/common/framing/Responder.cpp
+++ b/cpp/lib/common/framing/Responder.cpp
@@ -25,8 +25,9 @@ namespace framing {
 Responder::Responder() : lastId(0), responseMark(0) {}
 
 void Responder::received(const AMQRequestBody::Data& request) {
-    if (request.responseMark < responseMark || request.responseMark > lastId)
-        THROW_QPID_ERROR(PROTOCOL_ERROR, "Invalid resposne mark");
+    // 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");
     responseMark = request.responseMark;
 }