From 95554430d8a9f6d85c0ef10d77980cd2fe563444 Mon Sep 17 00:00:00 2001 From: Benoit Foucher Date: Thu, 13 Sep 2012 15:54:20 +0200 Subject: Fixed IceGrid issue caused by skype_props merge --- cpp/src/IceGrid/ServerCache.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'cpp/src/IceGrid/ServerCache.cpp') 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&) { -- cgit v1.2.3