From a2c01a4f2dc35aab8b905ad7efb5c62305e6d48b Mon Sep 17 00:00:00 2001
From: Ted Ross <tross@apache.org>
Date: Wed, 20 May 2009 15:17:21 +0000
Subject: Fixed a regression affecting plugin-exchanges. Plugin exchanges (i.e.
 the XML exchange) do not get the broker pointer and therefore can not
 register themselves with the management agent.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@776729 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/src/qpid/broker/ExchangeRegistry.cpp | 2 +-
 cpp/src/qpid/broker/ExchangeRegistry.h   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'cpp/src/qpid/broker')

diff --git a/cpp/src/qpid/broker/ExchangeRegistry.cpp b/cpp/src/qpid/broker/ExchangeRegistry.cpp
index 85bd65e456..59d516c089 100644
--- a/cpp/src/qpid/broker/ExchangeRegistry.cpp
+++ b/cpp/src/qpid/broker/ExchangeRegistry.cpp
@@ -60,7 +60,7 @@ pair<Exchange::shared_ptr, bool> ExchangeRegistry::declare(const string& name, c
             if (i == factory.end()) {
                 throw UnknownExchangeTypeException();    
             } else {
-                exchange = i->second(name, durable, args, parent);
+                exchange = i->second(name, durable, args, parent, broker);
             }
         }
         exchanges[name] = exchange;
diff --git a/cpp/src/qpid/broker/ExchangeRegistry.h b/cpp/src/qpid/broker/ExchangeRegistry.h
index 34ee173a91..3dc8eef187 100644
--- a/cpp/src/qpid/broker/ExchangeRegistry.h
+++ b/cpp/src/qpid/broker/ExchangeRegistry.h
@@ -42,8 +42,8 @@ struct UnknownExchangeTypeException{};
 
 class ExchangeRegistry{
   public:
-    typedef boost::function4<Exchange::shared_ptr, const std::string&, 
-                             bool, const qpid::framing::FieldTable&, qpid::management::Manageable*> FactoryFunction;
+    typedef boost::function5<Exchange::shared_ptr, const std::string&, 
+                             bool, const qpid::framing::FieldTable&, qpid::management::Manageable*, qpid::broker::Broker*> FactoryFunction;
 
     ExchangeRegistry (Broker* b = 0) : parent(0), broker(b) {}
     QPID_BROKER_EXTERN std::pair<Exchange::shared_ptr, bool> declare
-- 
cgit v1.2.1