diff options
Diffstat (limited to 'qpid/cpp/src/qpid/ha/HaBroker.cpp')
| -rw-r--r-- | qpid/cpp/src/qpid/ha/HaBroker.cpp | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/qpid/cpp/src/qpid/ha/HaBroker.cpp b/qpid/cpp/src/qpid/ha/HaBroker.cpp index ad97f87a62..c7692ac9a2 100644 --- a/qpid/cpp/src/qpid/ha/HaBroker.cpp +++ b/qpid/cpp/src/qpid/ha/HaBroker.cpp @@ -41,7 +41,9 @@ using namespace std; namespace { Url url(const std::string& s, const std::string& id) { try { - return Url(s); + // Allow the URL to be empty, used in tests that set the URL + // after starting broker + return s.empty() ? Url() : Url(s); } catch (const std::exception& e) { throw Exception(Msg() << "Invalid URL for " << id << ": '" << s << "'"); } @@ -55,15 +57,9 @@ const std::string BACKUP="backup"; HaBroker::HaBroker(broker::Broker& b, const Settings& s) : broker(b), settings(s), - brokerUrl(url(s.brokerUrl, "ha-broker-url")), - clientUrl(s.clientUrl.empty() ? brokerUrl : url(s.clientUrl, "ha-client-url")), backup(new Backup(b, s)), mgmtObject(0) { - // Note all HA brokers start out in backup mode. - QPID_LOG(notice, "HA: Backup initialized: " - << " broker-url=" << brokerUrl - << " client-url=" << clientUrl); // Register a factory for replicating subscriptions. broker.getConsumerFactories().add( boost::shared_ptr<ReplicatingSubscription::Factory>( @@ -96,15 +92,17 @@ Manageable::status_t HaBroker::ManagementMethod (uint32_t methodId, Args& args, break; } case _qmf::HaBroker::METHOD_SETCLIENTADDRESSES: { - clientUrl = dynamic_cast<_qmf::ArgsHaBrokerSetClientAddresses&>(args).i_clientAddresses; - mgmtObject->set_clientAddresses(clientUrl.str()); + string url = dynamic_cast<_qmf::ArgsHaBrokerSetClientAddresses&>(args) + .i_clientAddresses; + mgmtObject->set_clientAddresses(url); // FIXME aconway 2012-01-30: upate status for new URL break; } case _qmf::HaBroker::METHOD_SETBROKERADDRESSES: { - brokerUrl = dynamic_cast<_qmf::ArgsHaBrokerSetBrokerAddresses&>(args).i_brokerAddresses; - mgmtObject->set_brokerAddresses(brokerUrl.str()); - if (backup.get()) backup->setUrl(brokerUrl); + string url = dynamic_cast<_qmf::ArgsHaBrokerSetBrokerAddresses&>(args) + .i_brokerAddresses; + mgmtObject->set_brokerAddresses(url); + if (backup.get()) backup->setUrl(Url(url)); break; } default: |