summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/ServerCache.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/IceGrid/ServerCache.cpp')
-rw-r--r--cpp/src/IceGrid/ServerCache.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/ServerCache.cpp b/cpp/src/IceGrid/ServerCache.cpp
index 124359630d2..774b8b074f3 100644
--- a/cpp/src/IceGrid/ServerCache.cpp
+++ b/cpp/src/IceGrid/ServerCache.cpp
@@ -127,7 +127,7 @@ ServerCache::remove(const string& id, bool destroy)
Lock sync(*this);
ServerEntryPtr entry = getImpl(id);
- ServerInfo info = entry->getServerInfo();
+ ServerInfo info = entry->getInfo();
if(destroy)
{
entry->destroy();
@@ -296,7 +296,7 @@ ServerEntry::destroy()
}
ServerInfo
-ServerEntry::getServerInfo(bool resolve) const
+ServerEntry::getInfo(bool resolve) const
{
ServerInfo info;
SessionIPtr session;
@@ -336,6 +336,14 @@ ServerEntry::getId() const
}
ServerPrx
+ServerEntry::getProxy(bool upToDate)
+{
+ int actTimeout, deactTimeout;
+ string node;
+ return getProxy(actTimeout, deactTimeout, node, upToDate);
+}
+
+ServerPrx
ServerEntry::getProxy(int& activationTimeout, int& deactivationTimeout, string& node, bool upToDate)
{
{