summaryrefslogtreecommitdiff
path: root/cpp/src/IceDiscovery/PluginI.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2017-04-06 13:13:53 +0200
committerBenoit Foucher <benoit@zeroc.com>2017-04-06 13:13:53 +0200
commit663bfbfb71d16a4b50e981984751a9ec81112962 (patch)
treebc6f22a3901aa9e5246726fafe2a4a75e6e1dd44 /cpp/src/IceDiscovery/PluginI.cpp
parentMinor Util.py/Except.py fixes (diff)
downloadice-663bfbfb71d16a4b50e981984751a9ec81112962.tar.bz2
ice-663bfbfb71d16a4b50e981984751a9ec81112962.tar.xz
ice-663bfbfb71d16a4b50e981984751a9ec81112962.zip
Fixed ICE-7757 & ICE-7739 - IceLocatorDiscovery stops discovering locators
Diffstat (limited to 'cpp/src/IceDiscovery/PluginI.cpp')
-rw-r--r--cpp/src/IceDiscovery/PluginI.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/cpp/src/IceDiscovery/PluginI.cpp b/cpp/src/IceDiscovery/PluginI.cpp
index fa6e65bc5b2..37992bdab35 100644
--- a/cpp/src/IceDiscovery/PluginI.cpp
+++ b/cpp/src/IceDiscovery/PluginI.cpp
@@ -147,6 +147,7 @@ PluginI::initialize()
// Setup locator on the communicator.
//
Ice::ObjectPrxPtr loc = _locatorAdapter->addWithUUID(ICE_MAKE_SHARED(LocatorI, _lookup, locatorRegistryPrx));
+ _defaultLocator = _communicator->getDefaultLocator();
_communicator->setDefaultLocator(ICE_UNCHECKED_CAST(Ice::LocatorPrx, loc));
_multicastAdapter->activate();
@@ -161,4 +162,5 @@ PluginI::destroy()
_replyAdapter->destroy();
_locatorAdapter->destroy();
_lookup->destroy();
+ _communicator->setDefaultLocator(_defaultLocator);
}