diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-09-15 15:29:05 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-09-15 15:29:05 +0000 |
| commit | cc25d4e822f650e4d947b27a173c01de543738b4 (patch) | |
| tree | be3fde742978e351c3bcc0a8118a99752396499d /cpp/src/IceGrid/Database.cpp | |
| parent | Code cleanup (diff) | |
| download | ice-cc25d4e822f650e4d947b27a173c01de543738b4.tar.bz2 ice-cc25d4e822f650e4d947b27a173c01de543738b4.tar.xz ice-cc25d4e822f650e4d947b27a173c01de543738b4.zip | |
More code cleanup + added replica session timeout
Diffstat (limited to 'cpp/src/IceGrid/Database.cpp')
| -rw-r--r-- | cpp/src/IceGrid/Database.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/cpp/src/IceGrid/Database.cpp b/cpp/src/IceGrid/Database.cpp index dfb2d839d90..46867a30c3e 100644 --- a/cpp/src/IceGrid/Database.cpp +++ b/cpp/src/IceGrid/Database.cpp @@ -118,7 +118,6 @@ struct ObjectLoadCI : binary_function<pair<Ice::ObjectPrx, float>&, pair<Ice::Ob Database::Database(const Ice::ObjectAdapterPtr& registryAdapter, const IceStorm::TopicManagerPrx& topicManager, const string& instanceName, - int sessionTimeout, const TraceLevelsPtr& traceLevels, bool master) : _communicator(registryAdapter->getCommunicator()), @@ -127,13 +126,12 @@ Database::Database(const Ice::ObjectAdapterPtr& registryAdapter, _envName("Registry"), _instanceName(instanceName), _traceLevels(traceLevels), - _sessionTimeout(sessionTimeout), _master(master), _replicaCache(_communicator, topicManager), _nodeCache(_communicator, _replicaCache, _master), _objectCache(_communicator), _allocatableObjectCache(_communicator), - _serverCache(_communicator, _nodeCache, _adapterCache, _objectCache, _allocatableObjectCache, sessionTimeout), + _serverCache(_communicator, _nodeCache, _adapterCache, _objectCache, _allocatableObjectCache), _connection(Freeze::createConnection(registryAdapter->getCommunicator(), _envName)), _applications(_connection, _applicationDbName), _objects(_connection, _objectDbName), |