3 files changed, 5 insertions, 4 deletions
diff --git a/cpp/src/qpid/broker/BrokerChannel.cpp b/cpp/src/qpid/broker/BrokerChannel.cpp
index c1f0b44ed4..26e590f87e 100644
--- a/cpp/src/qpid/broker/BrokerChannel.cpp
+++ b/cpp/src/qpid/broker/BrokerChannel.cpp
@@ -55,7 +55,7 @@ Channel::Channel(
     uint32_t _framesize, MessageStore* const _store,
     uint64_t _stagingThreshold
 ) :
-    ChannelAdapter(id, &con.getOutput(), con.getVersion()),
+    ChannelAdapter(),
     connection(con),
     currentDeliveryTag(1),
     prefetchSize(0),
@@ -70,6 +70,7 @@ Channel::Channel(
     flowActive(true),
     adapter(new BrokerAdapter(*this, con, con.broker))
 {
+    init(id, con.getOutput(), con.getVersion());
     outstanding.reset();
 }
 
diff --git a/cpp/src/qpid/broker/Connection.cpp b/cpp/src/qpid/broker/Connection.cpp
index d809ef14d9..2bd835e753 100644
--- a/cpp/src/qpid/broker/Connection.cpp
+++ b/cpp/src/qpid/broker/Connection.cpp
@@ -66,8 +66,8 @@ Exchange::shared_ptr Connection::findExchange(const string& name){
 }
 
 
-void Connection::received(framing::AMQFrame* frame){
-    getChannel(frame->getChannel()).handleBody(frame->getBody());
+void Connection::received(framing::AMQFrame& frame){
+    getChannel((frame.getChannel())).getHandlers().in->handle(frame);
 }
 
 void Connection::close(
diff --git a/cpp/src/qpid/broker/Connection.h b/cpp/src/qpid/broker/Connection.h
index 3fc575280a..fcfc1d3334 100644
--- a/cpp/src/qpid/broker/Connection.h
+++ b/cpp/src/qpid/broker/Connection.h
@@ -80,7 +80,7 @@ class Connection : public sys::ConnectionInputHandler,
     std::vector<Queue::shared_ptr> exclusiveQueues;
 
     // ConnectionInputHandler methods
-    void received(framing::AMQFrame* frame);
+    void received(framing::AMQFrame& frame);
     void initiated(const framing::ProtocolInitiation& header);
     void idleOut();
     void idleIn();