diff options
| author | Andreas Sommer <andreas.sommer87@googlemail.com> | 2016-11-15 16:48:48 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-11-16 09:03:15 +0100 |
| commit | b2d356c3333ec09fb38a96fd5d544e49c1a43ebb (patch) | |
| tree | 618684582bb441ac49be8cb92c9584a484b0d94b /cpp/src | |
| parent | Fixed ICE-7439 - Renamed IceGridDiscovery to IceLocatorDiscovery in PropertyN... (diff) | |
| download | ice-b2d356c3333ec09fb38a96fd5d544e49c1a43ebb.tar.bz2 ice-b2d356c3333ec09fb38a96fd5d544e49c1a43ebb.tar.xz ice-b2d356c3333ec09fb38a96fd5d544e49c1a43ebb.zip | |
Fix updating runtime properties for services using shared communicator
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceGrid/ServerI.cpp | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp index 40f68962228..7ce139df955 100644 --- a/cpp/src/IceGrid/ServerI.cpp +++ b/cpp/src/IceGrid/ServerI.cpp @@ -341,7 +341,22 @@ private: { assert(_p->first.find("config_") == 0); const string service = _p->first.substr(7); - facet = "IceBox.Service." + service + ".Properties"; + bool useSharedCommunicator = false; + for (PropertyDescriptorSeq::const_iterator d = _properties.at("config").begin(); d != _properties.at("config").end(); ++d) + { + if (d->name == "IceBox.UseSharedCommunicator." + service) + { + useSharedCommunicator = (atoi(d->value.c_str()) > 0); + } + } + if (useSharedCommunicator) + { + facet = "IceBox.SharedCommunicator.Properties"; + } + else + { + facet = "IceBox.Service." + service + ".Properties"; + } if(_traceLevels->server > 1) { const string id = _server->getId(); |