* client/* framing/*: fixed client-side request ID processing.

* cpp/tests/InProcessBroker.h: For tests: connect to an in-process
  broker directly, bypass the network. Keeps log of client/broker
  conversation for verification in test code.

* cpp/tests/FramingTest.cpp (testRequestResponseRoundtrip):
  Client/broker round-trip test for request/reponse IDs and response mark.

* APRAcceptor.cpp (APRAcceptor): fixed valgrind uninitialized error.


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

1 files changed, 4 insertions, 4 deletions

diff --git a/cpp/lib/client/ClientChannel.h b/cpp/lib/client/ClientChannel.h
index 67274ddfc4..a34c95d2c4 100644
--- a/cpp/lib/client/ClientChannel.h
+++ b/cpp/lib/client/ClientChannel.h
@@ -124,21 +124,21 @@ class Channel : public framing::ChannelAdapter,
         const std::string& vhost);
     
     void sendAndReceive(
-        framing::AMQBody*, framing::ClassId, framing::MethodId);
+        framing::AMQMethodBody*, framing::ClassId, framing::MethodId);
 
     void sendAndReceiveSync(
         bool sync,
-        framing::AMQBody*, framing::ClassId, framing::MethodId);
+        framing::AMQMethodBody*, framing::ClassId, framing::MethodId);
 
     template <class BodyType>
-    boost::shared_ptr<BodyType> sendAndReceive(framing::AMQBody* body) {
+    boost::shared_ptr<BodyType> sendAndReceive(framing::AMQMethodBody* body) {
         sendAndReceive(body, BodyType::CLASS_ID, BodyType::METHOD_ID);
         return boost::shared_polymorphic_downcast<BodyType>(
             responses.getResponse());
     }
 
     template <class BodyType> void sendAndReceiveSync(
-        bool sync, framing::AMQBody* body) {
+        bool sync, framing::AMQMethodBody* body) {
         sendAndReceiveSync(
             sync, body, BodyType::CLASS_ID, BodyType::METHOD_ID);
     }