diff options
Diffstat (limited to 'devel/ice/files')
| -rw-r--r-- | devel/ice/files/patch-cpp-src-IceGrid-ServerI.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/devel/ice/files/patch-cpp-src-IceGrid-ServerI.cpp b/devel/ice/files/patch-cpp-src-IceGrid-ServerI.cpp index 83a3eade43b4..128820ca8e00 100644 --- a/devel/ice/files/patch-cpp-src-IceGrid-ServerI.cpp +++ b/devel/ice/files/patch-cpp-src-IceGrid-ServerI.cpp @@ -1,5 +1,5 @@ --- cpp/src/IceGrid/ServerI.cpp.orig 2016-11-15 12:22:54.201742997 +0100 -+++ cpp/src/IceGrid/ServerI.cpp 2016-11-15 12:48:01.409625996 +0100 ++++ cpp/src/IceGrid/ServerI.cpp 2017-09-07 12:48:01.409625996 +0100 @@ -341,7 +341,22 @@ { assert(_p->first.find("config_") == 0); @@ -24,3 +24,12 @@ 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; |