Refactor HandlerImpl to use Session rather than CoreRefs.

Remove most uses of ChannelAdapter in broker code.


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

1 files changed, 2 insertions, 3 deletions

diff --git a/cpp/src/qpid/framing/SendContent.cpp b/cpp/src/qpid/framing/SendContent.cpp
index 573ebca9e2..62a876f7c5 100644
--- a/cpp/src/qpid/framing/SendContent.cpp
+++ b/cpp/src/qpid/framing/SendContent.cpp
@@ -21,7 +21,7 @@
 
 #include "SendContent.h"
 
-qpid::framing::SendContent::SendContent(FrameHandler& h, uint16_t c, uint16_t mfs, uint efc) : handler(h), channel(c), 
+qpid::framing::SendContent::SendContent(FrameHandler& h, uint16_t mfs, uint efc) : handler(h), 
                                                                                               maxFrameSize(mfs),
                                                                                                expectedFrameCount(efc), frameCount(0) {}
 
@@ -45,14 +45,13 @@ void qpid::framing::SendContent::operator()(const AMQFrame& f)
     } else {
         AMQFrame copy(f);
         setFlags(copy, first, last);
-        copy.setChannel(channel);
         handler.handle(copy);
     }        
 }
 
 void qpid::framing::SendContent::sendFragment(const AMQContentBody& body, uint32_t offset, uint16_t size, bool first, bool last) const
 {
-    AMQFrame fragment(channel, AMQContentBody(body.getData().substr(offset, size)));
+    AMQFrame fragment(0, AMQContentBody(body.getData().substr(offset, size)));
     setFlags(fragment, first, last);
     handler.handle(fragment);
 }