diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-03-10 16:11:49 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-03-10 16:11:49 +0100 |
| commit | c53ac81f746ec2fb4c5783fe0637560be3e5a6bf (patch) | |
| tree | f15db862b19252b691459b71a265ae4f01a8ace1 /cpp/src/IceGrid/ServerI.cpp | |
| parent | ICE-6170 - fixed behavior of batch requests (diff) | |
| download | ice-c53ac81f746ec2fb4c5783fe0637560be3e5a6bf.tar.bz2 ice-c53ac81f746ec2fb4c5783fe0637560be3e5a6bf.tar.xz ice-c53ac81f746ec2fb4c5783fe0637560be3e5a6bf.zip | |
Fixed ICE-6362 : fixed IceLocatorDiscovery infinite retry
Diffstat (limited to 'cpp/src/IceGrid/ServerI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/ServerI.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp index 34f0030d790..7fcc644b987 100644 --- a/cpp/src/IceGrid/ServerI.cpp +++ b/cpp/src/IceGrid/ServerI.cpp @@ -1338,7 +1338,7 @@ ServerI::checkUpdate(const InternalServerDescriptorPtr& desc, bool noRestart, co } return true; } - + InternalServerDescriptorPtr d = _load ? _load->getInternalServerDescriptor() : _desc; if(!descriptorUpdated(d, desc)) { @@ -1406,7 +1406,7 @@ ServerI::destroy(const AMD_Node_destroyServerPtr& amdCB, const string& uuid, int } _stop = new StopCommand(this, _node->getTimer(), _deactivationTimeout); } - + if(!_destroy) { // @@ -3215,11 +3215,11 @@ ServerI::getProperties(const InternalServerDescriptorPtr& desc) p->second.push_back(createProperty("Ice.Default.Locator", locator)); } - string discoveryPlugin = properties->getProperty("Ice.Plugin.IceGridDiscovery"); + string discoveryPlugin = properties->getProperty("Ice.Plugin.IceLocatorDiscovery"); if(!discoveryPlugin.empty()) { - p->second.push_back(createProperty("Ice.Plugin.IceGridDiscovery", discoveryPlugin)); - p->second.push_back(createProperty("IceGridDiscovery.InstanceName", _node->getInstanceName())); + p->second.push_back(createProperty("Ice.Plugin.IceLocatorDiscovery", discoveryPlugin)); + p->second.push_back(createProperty("IceLocatorDiscovery.InstanceName", _node->getInstanceName())); } } |