diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2010-02-19 18:45:14 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2010-02-19 18:45:14 +0100 |
| commit | ea9a8bcfc079175205766491ab217e65536a656f (patch) | |
| tree | 8dd6cd069f9966bd59d72587052a42195d45cf63 /cpp/src/IceGrid/NodeSessionI.cpp | |
| parent | added txt to ICE_LICENSE (diff) | |
| download | ice-ea9a8bcfc079175205766491ab217e65536a656f.tar.bz2 ice-ea9a8bcfc079175205766491ab217e65536a656f.tar.xz ice-ea9a8bcfc079175205766491ab217e65536a656f.zip | |
Fixed bug 4677 - IceGrid update hang
Diffstat (limited to 'cpp/src/IceGrid/NodeSessionI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/NodeSessionI.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/cpp/src/IceGrid/NodeSessionI.cpp b/cpp/src/IceGrid/NodeSessionI.cpp index 6486e8bb26e..9816b7eaa48 100644 --- a/cpp/src/IceGrid/NodeSessionI.cpp +++ b/cpp/src/IceGrid/NodeSessionI.cpp @@ -244,14 +244,11 @@ NodeSessionI::loadServers_async(const AMD_NodeSession_loadServersPtr& amdCB, con // // Get the server proxies to load them on the node. // - try - { - ServerEntrySeq servers = _database->getNode(_info->name)->getServers(); - for_each(servers.begin(), servers.end(), IceUtil::voidMemFun(&ServerEntry::syncAndWait)); - } - catch(const DeploymentException&) + ServerEntrySeq servers = _database->getNode(_info->name)->getServers(); + for(ServerEntrySeq::const_iterator p = servers.begin(); p != servers.end(); ++p) { - // Ignore. + (*p)->sync(); + (*p)->waitForSyncNoThrow(1); // Don't wait too long. } } |