Deleted following files that are obsolete for 0-10:

      src/qpid/framing/AMQRequestBody.cpp
      src/qpid/framing/AMQRequestBody.h
      src/qpid/framing/AMQResponseBody.cpp
      src/qpid/framing/AMQResponseBody.h
      src/qpid/framing/Correlator.cpp
      src/qpid/framing/Correlator.h
      src/qpid/framing/MethodContext.cpp
      src/qpid/framing/Requester.cpp
      src/qpid/framing/Requester.h
      src/qpid/framing/Responder.cpp
      src/qpid/framing/Responder.h

Made changes to support their deletion.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@565770 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 5 insertions, 10 deletions

diff --git a/cpp/src/qpid/broker/ConnectionAdapter.cpp b/cpp/src/qpid/broker/ConnectionAdapter.cpp
index 65933660f1..4fa4b2c238 100644
--- a/cpp/src/qpid/broker/ConnectionAdapter.cpp
+++ b/cpp/src/qpid/broker/ConnectionAdapter.cpp
@@ -50,14 +50,10 @@ void ConnectionAdapter::handleMethodInContext(
 )
 {
     try{
-        handler->client.setResponseTo(context.getRequestId());
         method->invoke(*this, context);
-        handler->client.setResponseTo(0);
     }catch(ConnectionException& e){
-        handler->client.setResponseTo(0);
         handler->client.close(e.code, e.toString(), method->amqpClassId(), method->amqpMethodId());
     }catch(std::exception& e){
-        handler->client.setResponseTo(0);
         handler->client.close(541/*internal error*/, e.what(), method->amqpClassId(), method->amqpMethodId());
     }
 }
diff --git a/cpp/src/qpid/broker/MessageHandlerImpl.cpp b/cpp/src/qpid/broker/MessageHandlerImpl.cpp
index c728a800ab..70f7c3b8ec 100644
--- a/cpp/src/qpid/broker/MessageHandlerImpl.cpp
+++ b/cpp/src/qpid/broker/MessageHandlerImpl.cpp
@@ -162,10 +162,9 @@ MessageHandlerImpl::transfer(const framing::MethodContext& context)
     MessageTransferBody::shared_ptr transfer(
         boost::shared_polymorphic_downcast<MessageTransferBody>(
             context.methodBody));
-    RequestId requestId = context.getRequestId();
     
     if (transfer->getBody().isInline()) {
-        MessageMessage::shared_ptr message(new MessageMessage(&connection, requestId, transfer));
+        MessageMessage::shared_ptr message(new MessageMessage(&connection, 0, transfer));
         channel.handleInlineTransfer(message);
     } else { 
         throw ConnectionException(540, "References no longer supported");
diff --git a/cpp/src/qpid/broker/SemanticHandler.cpp b/cpp/src/qpid/broker/SemanticHandler.cpp
index 08f91bf69a..fd0a5cfbe1 100644
--- a/cpp/src/qpid/broker/SemanticHandler.cpp
+++ b/cpp/src/qpid/broker/SemanticHandler.cpp
@@ -171,16 +171,16 @@ void SemanticHandler::redeliver(Message::shared_ptr& msg, DeliveryToken::shared_
     msg->deliver(*this, tag, token, connection.getFrameMax());
 }
 
-RequestId SemanticHandler::send(shared_ptr<AMQBody> body, Correlator::Action action)
+RequestId SemanticHandler::send(shared_ptr<AMQBody> body)
 {
     Mutex::ScopedLock l(outLock);
     uint8_t type(body->type());
-    if (type == REQUEST_BODY || type == RESPONSE_BODY || type == METHOD_BODY) {
+    if (type == METHOD_BODY) {
         //temporary hack until channel management is moved to its own handler:
         if (dynamic_pointer_cast<AMQMethodBody>(body)->amqpClassId() != ChannelOpenBody::CLASS_ID) {
             ++outgoing.hwm;
             //std::cout << "[" << this << "] allocated: " << outgoing.hwm.getValue() << " to " << *body  << std::endl;
         }
     }
-    return ChannelAdapter::send(body, action);
+    return ChannelAdapter::send(body);
 }
diff --git a/cpp/src/qpid/broker/SemanticHandler.h b/cpp/src/qpid/broker/SemanticHandler.h
index b863b3486e..7d5d95243e 100644
--- a/cpp/src/qpid/broker/SemanticHandler.h
+++ b/cpp/src/qpid/broker/SemanticHandler.h
@@ -59,7 +59,7 @@ class SemanticHandler : private framing::ChannelAdapter,
     void handleContent(boost::shared_ptr<qpid::framing::AMQContentBody>);
     void handleHeartbeat(boost::shared_ptr<qpid::framing::AMQHeartbeatBody>);
 
-    framing::RequestId send(shared_ptr<framing::AMQBody> body, framing::Correlator::Action action=framing::Correlator::Action());
+    framing::RequestId send(shared_ptr<framing::AMQBody> body);
 
 
     //delivery adapter methods: