summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/NodeCache.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2014-05-23 11:59:44 +0200
committerBenoit Foucher <benoit@zeroc.com>2014-05-23 11:59:44 +0200
commitd81701ca8182942b7936f9fd84a019b695e9c890 (patch)
treedc036c9d701fbbe1afad67782bd78572c0f61974 /cpp/src/IceGrid/NodeCache.cpp
parentFixed bug ICE-5543: stringToIdentity bug with escaped escapes (diff)
downloadice-d81701ca8182942b7936f9fd84a019b695e9c890.tar.bz2
ice-d81701ca8182942b7936f9fd84a019b695e9c890.tar.xz
ice-d81701ca8182942b7936f9fd84a019b695e9c890.zip
Added support for invocation timeouts and ACM heartbeats
Diffstat (limited to 'cpp/src/IceGrid/NodeCache.cpp')
-rw-r--r--cpp/src/IceGrid/NodeCache.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/NodeCache.cpp b/cpp/src/IceGrid/NodeCache.cpp
index c38d7d1e31e..e7f138ce926 100644
--- a/cpp/src/IceGrid/NodeCache.cpp
+++ b/cpp/src/IceGrid/NodeCache.cpp
@@ -568,7 +568,7 @@ NodeEntry::loadServer(const ServerEntryPtr& entry, const ServerInfo& server, con
//
if(timeout > 0)
{
- node = NodePrx::uncheckedCast(node->ice_timeout(timeout * 1000));
+ node = NodePrx::uncheckedCast(node->ice_invocationTimeout(timeout * 1000));
}
ServerInfo info = server;
@@ -641,7 +641,7 @@ NodeEntry::destroyServer(const ServerEntryPtr& entry, const ServerInfo& info, in
//
if(timeout > 0)
{
- node = NodePrx::uncheckedCast(node->ice_timeout(timeout * 1000));
+ node = NodePrx::uncheckedCast(node->ice_invocationTimeout(timeout * 1000));
}
}