summaryrefslogtreecommitdiff
path: root/cpp/src/IceDiscovery/PluginI.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2017-05-10 21:52:54 +0200
committerBenoit Foucher <benoit@zeroc.com>2017-05-10 21:52:54 +0200
commit721d887e81382cdaf7f0efde3c243684aa1918b2 (patch)
treebc39ef27d129373682a2548bf0ec4f235ac1ab0a /cpp/src/IceDiscovery/PluginI.cpp
parentFix Makefile indentation (diff)
downloadice-721d887e81382cdaf7f0efde3c243684aa1918b2.tar.bz2
ice-721d887e81382cdaf7f0efde3c243684aa1918b2.tar.xz
ice-721d887e81382cdaf7f0efde3c243684aa1918b2.zip
Fixed ICE-7869 - IceGridGUI NPE
Diffstat (limited to 'cpp/src/IceDiscovery/PluginI.cpp')
-rw-r--r--cpp/src/IceDiscovery/PluginI.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/IceDiscovery/PluginI.cpp b/cpp/src/IceDiscovery/PluginI.cpp
index 1489f725184..8e03497e85e 100644
--- a/cpp/src/IceDiscovery/PluginI.cpp
+++ b/cpp/src/IceDiscovery/PluginI.cpp
@@ -139,7 +139,8 @@ PluginI::initialize()
ICE_UNCHECKED_CAST(Ice::LocatorRegistryPrx, _locatorAdapter->addWithUUID(locatorRegistry));
Ice::ObjectPrxPtr lookupPrx = _communicator->stringToProxy("IceDiscovery/Lookup -d:" + lookupEndpoints);
- lookupPrx = lookupPrx->ice_collocationOptimized(false); // No collocation optimization for the multicast proxy!
+ // No collocation optimization for the multicast proxy!
+ lookupPrx = lookupPrx->ice_collocationOptimized(false)->ice_router(ICE_NULLPTR);
//
// Add lookup and lookup reply Ice objects