diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-09-07 19:22:21 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-09-07 19:22:21 +0200 |
| commit | 0677cc18432aeb45d1e926a2bfd50dcd5995258f (patch) | |
| tree | 6b7e8ab08e9fda6dd2aada6c9fb1c431fde1767e /cpp/src/IceGrid/ServerI.cpp | |
| parent | Fix adapter list update problem on replica icegridregistries. (diff) | |
| download | ice-0677cc18432aeb45d1e926a2bfd50dcd5995258f.tar.bz2 ice-0677cc18432aeb45d1e926a2bfd50dcd5995258f.tar.xz ice-0677cc18432aeb45d1e926a2bfd50dcd5995258f.zip | |
Added CHANGELOG entry and comment for Michael's fix
Diffstat (limited to 'cpp/src/IceGrid/ServerI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/ServerI.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp index 577cd7fedb4..dd06b2932b7 100644 --- a/cpp/src/IceGrid/ServerI.cpp +++ b/cpp/src/IceGrid/ServerI.cpp @@ -1234,6 +1234,10 @@ ServerI::load(const AMD_Node_loadServerPtr& amdCB, const InternalServerDescripto if(!_desc || (_load && descriptorUpdated(_load->getInternalServerDescriptor(), _desc))) { + // + // If the server initial loading didn't complete yet or there's a new updated descriptor + // waiting to be loaded, we wait for the loading to complete before replying. + // _load->addCallback(amdCB); return 0; } |