3 files changed, 6 insertions, 5 deletions
diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp
index 26ec55ac44..fa183979e1 100644
--- a/cpp/src/qpid/broker/Broker.cpp
+++ b/cpp/src/qpid/broker/Broker.cpp
@@ -47,6 +47,7 @@
 using qpid::sys::Acceptor;
 using qpid::framing::HandlerUpdater;
 using qpid::framing::FrameHandler;
+using qpid::framing::ChannelId;
 
 namespace qpid {
 namespace broker {
@@ -162,9 +163,10 @@ void Broker::add(const shared_ptr<HandlerUpdater>& updater) {
     handlerUpdaters.push_back(updater);
 }
 
-void Broker::update(FrameHandler::Chains& chains) {
+void Broker::update(ChannelId channel, FrameHandler::Chains& chains) {
     for_each(handlerUpdaters.begin(), handlerUpdaters.end(),
-             boost::bind(&HandlerUpdater::update, _1, boost::ref(chains)));
+             boost::bind(&HandlerUpdater::update, _1,
+                         channel, boost::ref(chains)));
 }
 
 }} // namespace qpid::broker
diff --git a/cpp/src/qpid/broker/Broker.h b/cpp/src/qpid/broker/Broker.h
index 9f57a45e0c..1ccc3564f5 100644
--- a/cpp/src/qpid/broker/Broker.h
+++ b/cpp/src/qpid/broker/Broker.h
@@ -33,7 +33,6 @@
 #include "qpid/Plugin.h"
 #include "qpid/Url.h"
 #include "qpid/framing/FrameHandler.h"
-#include "qpid/framing/HandlerUpdater.h"
 #include "qpid/framing/OutputHandler.h"
 #include "qpid/framing/ProtocolInitiation.h"
 #include "qpid/sys/Acceptor.h"
@@ -96,7 +95,7 @@ class Broker : public sys::Runnable, public Plugin::Target
     void add(const shared_ptr<framing::HandlerUpdater>&);
     
     /** Apply all handler updaters to a handler chain pair. */
-    void update(framing::FrameHandler::Chains&); 
+    void update(framing::ChannelId, framing::FrameHandler::Chains&); 
     
     MessageStore& getStore() { return *store; }
     QueueRegistry& getQueues() { return queues; }
diff --git a/cpp/src/qpid/broker/Connection.cpp b/cpp/src/qpid/broker/Connection.cpp
index 5b22167323..6bd846e2a3 100644
--- a/cpp/src/qpid/broker/Connection.cpp
+++ b/cpp/src/qpid/broker/Connection.cpp
@@ -108,7 +108,7 @@ FrameHandler::Chains& Connection::getChannel(ChannelId id) {
         FrameHandler::Chains chains(
             new SemanticHandler(id, *this),
             new OutputHandlerFrameHandler(*out));
-        broker.update(chains);
+        broker.update(id, chains);
         i = channels.insert(ChannelMap::value_type(id, chains)).first;
     }        
     return i->second;