3 files changed, 3 insertions, 21 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);
 }
diff --git a/cpp/src/qpid/framing/SendContent.h b/cpp/src/qpid/framing/SendContent.h
index 05b5838c62..dcd5202b3e 100644
--- a/cpp/src/qpid/framing/SendContent.h
+++ b/cpp/src/qpid/framing/SendContent.h
@@ -37,7 +37,6 @@ namespace framing {
 class SendContent
 {
     mutable FrameHandler& handler;
-    const uint16_t channel;
     const uint16_t maxFrameSize;
     uint expectedFrameCount;
     uint frameCount;
@@ -45,7 +44,7 @@ class SendContent
     void sendFragment(const AMQContentBody& body, uint32_t offset, uint16_t size, bool first, bool last) const;
     void setFlags(AMQFrame& f, bool first, bool last) const;
 public:
-    SendContent(FrameHandler& _handler, uint16_t channel, uint16_t _maxFrameSize, uint frameCount);
+    SendContent(FrameHandler& _handler, uint16_t _maxFrameSize, uint frameCount);
     void operator()(const AMQFrame& f);
 };
 
diff --git a/cpp/src/qpid/framing/frame_functors.h b/cpp/src/qpid/framing/frame_functors.h
index 7b7e24b2b3..ed664d1529 100644
--- a/cpp/src/qpid/framing/frame_functors.h
+++ b/cpp/src/qpid/framing/frame_functors.h
@@ -82,22 +82,6 @@ public:
     void operator()(const AMQFrame& f) { content += f.castBody<AMQContentBody>()->getData(); }
 };
 
-class Relay
-{
-    FrameHandler& handler;
-    const uint16_t channel;
-
-public:
-    Relay(FrameHandler& h, uint16_t c) : handler(h), channel(c) {}
-
-    void operator()(AMQFrame& f)
-    {
-        AMQFrame copy(f);
-        copy.setChannel(channel);
-        handler.handle(copy);
-    }
-};
-
 class Print
 {
     std::ostream& out;