mirror of
https://git.freebsd.org/ports.git
synced 2025-06-20 20:20:30 -04:00
30cadb100d
adapter information about a server if an update is pending for this server. See also: https://github.com/zeroc-ice/ice/pull/18
35 lines
1.4 KiB
C++
35 lines
1.4 KiB
C++
--- cpp/src/IceGrid/ServerI.cpp.orig 2016-11-15 12:22:54.201742997 +0100
|
|
+++ cpp/src/IceGrid/ServerI.cpp 2017-09-07 12:48:01.409625996 +0100
|
|
@@ -341,7 +341,22 @@
|
|
{
|
|
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();
|
|
@@ -1232,7 +1232,7 @@ ServerI::load(const AMD_Node_loadServerPtr& amdCB, const InternalServerDescripto
|
|
updateRevision(desc->uuid, desc->revision);
|
|
}
|
|
|
|
- if(!_desc)
|
|
+ if(!_desc || (_load && descriptorUpdated(_load->getInternalServerDescriptor(), _desc)))
|
|
{
|
|
_load->addCallback(amdCB);
|
|
return 0;
|