diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-09-13 15:54:20 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-09-13 15:54:20 +0200 |
| commit | 95554430d8a9f6d85c0ef10d77980cd2fe563444 (patch) | |
| tree | ec1b405f55c00efee8b6571881f1ad2ce330d7ea /cpp/src | |
| parent | Added Ice/metrics test (diff) | |
| download | ice-95554430d8a9f6d85c0ef10d77980cd2fe563444.tar.bz2 ice-95554430d8a9f6d85c0ef10d77980cd2fe563444.tar.xz ice-95554430d8a9f6d85c0ef10d77980cd2fe563444.zip | |
Fixed IceGrid issue caused by skype_props merge
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceGrid/ServerCache.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/ServerCache.cpp b/cpp/src/IceGrid/ServerCache.cpp index 5d8d8942b29..fcf525f9ae7 100644 --- a/cpp/src/IceGrid/ServerCache.cpp +++ b/cpp/src/IceGrid/ServerCache.cpp @@ -939,7 +939,7 @@ ServerEntry::checkUpdate(const ServerInfo& info, bool noRestart) ServerInfo oldInfo = _loaded.get() ? *_loaded : *_load; if(noRestart && info.node != oldInfo.node) { - throw DeploymentException("server `" + _id + "' is moved to another node"); + throw DeploymentException("server `" + _id + "' is moving to another node"); } session = _session; @@ -958,7 +958,14 @@ ServerEntry::checkUpdate(const ServerInfo& info, bool noRestart) ServerPrx server; try { - server = getProxy(true); + server = getProxy(true, 5); + } + catch(const SynchronizationException&) + { + ostringstream os; + os << "check for server `" << _id << "' update failed:"; + os << "timeout while waiting for the server to be loaded on the node"; + throw DeploymentException(os.str()); } catch(const DeploymentException&) { |