From 9e115470654bf67fbb4720ab3bfb3768b9331e55 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Thu, 26 Jun 2008 21:39:28 +0000 Subject: Plugin framework change: single PluginFactory creates per-target Plugin instances. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@672032 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/broker/Broker.cpp | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'cpp/src/qpid/broker/Broker.cpp') diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp index f008eb23f7..a3dd93899a 100644 --- a/cpp/src/qpid/broker/Broker.cpp +++ b/cpp/src/qpid/broker/Broker.cpp @@ -166,13 +166,7 @@ Broker::Broker(const Broker::Options& conf) : links.setParent (vhost); } - // Early-Initialize plugins - const Plugin::Plugins& plugins=Plugin::getPlugins(); - for (Plugin::Plugins::const_iterator i = plugins.begin(); - i != plugins.end(); - i++) - (*i)->earlyInitialize(*this); - + createPlugins(); // If no plugin store module registered itself, set up the null store. if (store == 0) setStore (new NullMessageStore (false)); @@ -223,11 +217,7 @@ Broker::Broker(const Broker::Options& conf) : #endif } - // Initialize plugins - for (Plugin::Plugins::const_iterator i = plugins.begin(); - i != plugins.end(); - i++) - (*i)->initialize(*this); + initializePlugins(); } void Broker::declareStandardExchange(const std::string& name, const std::string& type) -- cgit v1.2.1