diff options
| -rw-r--r-- | cpp/src/qpid/replication/ReplicationExchange.cpp | 17 | ||||
| -rw-r--r-- | cpp/src/qpid/replication/ReplicationExchange.h | 3 | ||||
| -rw-r--r-- | cpp/src/qpid/xml/XmlExchangePlugin.cpp | 4 |
3 files changed, 13 insertions, 11 deletions
diff --git a/cpp/src/qpid/replication/ReplicationExchange.cpp b/cpp/src/qpid/replication/ReplicationExchange.cpp index 053a317743..613ab74d8c 100644 --- a/cpp/src/qpid/replication/ReplicationExchange.cpp +++ b/cpp/src/qpid/replication/ReplicationExchange.cpp @@ -38,8 +38,8 @@ const std::string SEQUENCE_VALUE("qpid.replication-event.sequence"); ReplicationExchange::ReplicationExchange(const std::string& name, bool durable, const FieldTable& _args, QueueRegistry& qr, - Manageable* parent) - : Exchange(name, durable, _args, parent), queues(qr), sequence(args.getAsInt64(SEQUENCE_VALUE)), init(false) + Manageable* parent, Broker* broker) + : Exchange(name, durable, _args, parent, broker), queues(qr), sequence(args.getAsInt64(SEQUENCE_VALUE)), init(false) { args.setInt64(SEQUENCE_VALUE, sequence); } @@ -156,31 +156,32 @@ struct ReplicationExchangePlugin : Plugin void initialize(Plugin::Target& target); Exchange::shared_ptr create(const std::string& name, bool durable, const framing::FieldTable& args, - management::Manageable* parent); + management::Manageable* parent, + qpid::broker::Broker* broker); }; ReplicationExchangePlugin::ReplicationExchangePlugin() : broker(0) {} Exchange::shared_ptr ReplicationExchangePlugin::create(const std::string& name, bool durable, const framing::FieldTable& args, - management::Manageable* parent) + management::Manageable* parent, qpid::broker::Broker* broker) { - Exchange::shared_ptr e(new ReplicationExchange(name, durable, args, broker->getQueues(), parent)); + Exchange::shared_ptr e(new ReplicationExchange(name, durable, args, broker->getQueues(), parent, broker)); return e; } -void ReplicationExchangePlugin::initialize(Plugin::Target& target) +void ReplicationExchangePlugin::earlyInitialize(Plugin::Target& target) { broker = dynamic_cast<broker::Broker*>(&target); if (broker) { - ExchangeRegistry::FactoryFunction f = boost::bind(&ReplicationExchangePlugin::create, this, _1, _2, _3, _4); + ExchangeRegistry::FactoryFunction f = boost::bind(&ReplicationExchangePlugin::create, this, _1, _2, _3, _4, _5); broker->getExchanges().registerType(ReplicationExchange::typeName, f); QPID_LOG(info, "Registered replication exchange"); } } -void ReplicationExchangePlugin::earlyInitialize(Target&) {} +void ReplicationExchangePlugin::initialize(Target&) {} static ReplicationExchangePlugin exchangePlugin; diff --git a/cpp/src/qpid/replication/ReplicationExchange.h b/cpp/src/qpid/replication/ReplicationExchange.h index 4cc45ed5f5..ab36704e06 100644 --- a/cpp/src/qpid/replication/ReplicationExchange.h +++ b/cpp/src/qpid/replication/ReplicationExchange.h @@ -42,7 +42,8 @@ class ReplicationExchange : public qpid::broker::Exchange ReplicationExchange(const std::string& name, bool durable, const qpid::framing::FieldTable& args, qpid::broker::QueueRegistry& queues, - qpid::management::Manageable* parent = 0); + qpid::management::Manageable* parent = 0, + qpid::broker::Broker* broker = 0); std::string getType() const; diff --git a/cpp/src/qpid/xml/XmlExchangePlugin.cpp b/cpp/src/qpid/xml/XmlExchangePlugin.cpp index 4bd3ed741e..8f2d127424 100644 --- a/cpp/src/qpid/xml/XmlExchangePlugin.cpp +++ b/cpp/src/qpid/xml/XmlExchangePlugin.cpp @@ -51,7 +51,7 @@ public: }; -void XmlExchangePlugin::initialize(Plugin::Target& target) +void XmlExchangePlugin::earlyInitialize(Plugin::Target& target) { Broker* broker = dynamic_cast<broker::Broker*>(&target); if (broker) { @@ -60,7 +60,7 @@ void XmlExchangePlugin::initialize(Plugin::Target& target) } } -void XmlExchangePlugin::earlyInitialize(Target&) {} +void XmlExchangePlugin::initialize(Target&) {} static XmlExchangePlugin matchingPlugin; |