diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-07-27 13:20:03 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-07-27 13:20:03 +0000 |
| commit | dad0bda0d462b4730b168befd187ca43446f12e7 (patch) | |
| tree | 1a964dc5a3bd2c945e0ee165ddda55c3e4281157 /cpp/src/IceGrid/ServerCache.cpp | |
| parent | Improved __checkMode (diff) | |
| download | ice-dad0bda0d462b4730b168befd187ca43446f12e7.tar.bz2 ice-dad0bda0d462b4730b168befd187ca43446f12e7.tar.xz ice-dad0bda0d462b4730b168befd187ca43446f12e7.zip | |
More IceGrid replication improvements.
Diffstat (limited to 'cpp/src/IceGrid/ServerCache.cpp')
| -rw-r--r-- | cpp/src/IceGrid/ServerCache.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cpp/src/IceGrid/ServerCache.cpp b/cpp/src/IceGrid/ServerCache.cpp index 8754d40f179..bc09d395656 100644 --- a/cpp/src/IceGrid/ServerCache.cpp +++ b/cpp/src/IceGrid/ServerCache.cpp @@ -63,12 +63,14 @@ ServerCache::ServerCache(const Ice::CommunicatorPtr& communicator, NodeCache& nodeCache, AdapterCache& adapterCache, ObjectCache& objectCache, - AllocatableObjectCache& allocatableObjectCache) : + AllocatableObjectCache& allocatableObjectCache, + int sessionTimeout) : _communicator(communicator), _nodeCache(nodeCache), _adapterCache(adapterCache), _objectCache(objectCache), - _allocatableObjectCache(allocatableObjectCache) + _allocatableObjectCache(allocatableObjectCache), + _sessionTimeout(sessionTimeout) { } @@ -623,7 +625,7 @@ ServerEntry::loadCallback(const ServerPrx& proxy, const AdapterPrxDict& adpts, i // _loaded = _load; assert(_loaded.get()); - int timeout = _cache.getNodeCache().getSessionTimeout() * 1000; // sec to ms + int timeout = _cache.getSessionTimeout() * 1000; // sec to ms _proxy = ServerPrx::uncheckedCast(proxy->ice_timeout(timeout)->ice_collocationOptimized(false)); _adapters.clear(); for(AdapterPrxDict::const_iterator p = adpts.begin(); p != adpts.end(); ++p) |