diff options
author | Benoit Foucher <benoit@zeroc.com> | 2006-11-24 14:10:34 +0000 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2006-11-24 14:10:34 +0000 |
commit | df8bf3b419976462a82ea6cc5ba55513f50f7a54 (patch) | |
tree | b3befacd3c9ac0b6ee28f9a1845134b5d292eee1 /cpp/src/IceGrid/ServerCache.cpp | |
parent | *** empty log message *** (diff) | |
download | ice-df8bf3b419976462a82ea6cc5ba55513f50f7a54.tar.bz2 ice-df8bf3b419976462a82ea6cc5ba55513f50f7a54.tar.xz ice-df8bf3b419976462a82ea6cc5ba55513f50f7a54.zip |
Code cleanup
Diffstat (limited to 'cpp/src/IceGrid/ServerCache.cpp')
-rw-r--r-- | cpp/src/IceGrid/ServerCache.cpp | 12 |
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) { { |