From 9b12ee6b394e046023b4836a2a5288db6ee32c3b Mon Sep 17 00:00:00 2001 From: Benoit Foucher Date: Wed, 17 Jun 2015 21:17:55 +0200 Subject: The communicator now catch exceptions raised by plugin initialize and raise PluginInitializationException instead --- cpp/src/IceDiscovery/PluginI.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cpp/src/IceDiscovery/PluginI.cpp') diff --git a/cpp/src/IceDiscovery/PluginI.cpp b/cpp/src/IceDiscovery/PluginI.cpp index 387fffd21fa..6873cec56b6 100644 --- a/cpp/src/IceDiscovery/PluginI.cpp +++ b/cpp/src/IceDiscovery/PluginI.cpp @@ -95,7 +95,7 @@ PluginI::initialize() // Setup locatory registry. // LocatorRegistryIPtr locatorRegistry = new LocatorRegistryI(_communicator); - Ice::LocatorRegistryPrx locatorRegistryPrx = + Ice::LocatorRegistryPrx locatorRegistryPrx = Ice::LocatorRegistryPrx::uncheckedCast(_locatorAdapter->addWithUUID(locatorRegistry)); string lookupEndpoints = properties->getProperty("IceDiscovery.Lookup"); @@ -125,7 +125,7 @@ PluginI::initialize() catch(const Ice::LocalException& ex) { ostringstream os; - os << "unable to establish multicast connection, IceDiscovery will be disabled:\n"; + os << "IceDiscovery is unable to establish a multicast connection:\n"; os << "proxy = " << lookupPrx << '\n'; os << ex; throw Ice::PluginInitializationException(__FILE__, __LINE__, os.str()); @@ -145,7 +145,7 @@ PluginI::initialize() // Ice::ObjectPrx loc = _locatorAdapter->addWithUUID(new LocatorI(_lookup, locatorRegistryPrx)); _communicator->setDefaultLocator(Ice::LocatorPrx::uncheckedCast(loc)); - + _multicastAdapter->activate(); _replyAdapter->activate(); _locatorAdapter->activate(); -- cgit v1.2.3