diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-09-03 14:42:10 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-09-03 14:42:10 +0200 |
| commit | c82f0a59f136fbeb8b66eabdc29e0e18b64d6717 (patch) | |
| tree | 585ce7bf387885677d020463e446424598a34093 /cpp/src/IceStorm/Instance.cpp | |
| parent | Merge branch 'encoding11' into mx (diff) | |
| parent | changing data member mapping to use Ice.Optional in C# (diff) | |
| download | ice-c82f0a59f136fbeb8b66eabdc29e0e18b64d6717.tar.bz2 ice-c82f0a59f136fbeb8b66eabdc29e0e18b64d6717.tar.xz ice-c82f0a59f136fbeb8b66eabdc29e0e18b64d6717.zip | |
Merge remote-tracking branch 'origin/encoding11' into mx
Conflicts:
cpp/src/IceGrid/Database.cpp
Diffstat (limited to 'cpp/src/IceStorm/Instance.cpp')
| -rw-r--r-- | cpp/src/IceStorm/Instance.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/IceStorm/Instance.cpp b/cpp/src/IceStorm/Instance.cpp index add665c71f2..db9446b93cc 100644 --- a/cpp/src/IceStorm/Instance.cpp +++ b/cpp/src/IceStorm/Instance.cpp @@ -25,7 +25,7 @@ Instance::Instance( const string& instanceName, const string& name, const Ice::CommunicatorPtr& communicator, - const DatabaseCachePtr& databaseCache, + const ConnectionPoolPtr& connectionPool, const Ice::ObjectAdapterPtr& publishAdapter, const Ice::ObjectAdapterPtr& topicAdapter, const Ice::ObjectAdapterPtr& nodeAdapter, @@ -44,7 +44,7 @@ Instance::Instance( name + ".Flush.Timeout", 1000))), // default one second. // default one minute. _sendTimeout(communicator->getProperties()->getPropertyAsIntWithDefault(name + ".Send.Timeout", 60 * 1000)), - _databaseCache(databaseCache) + _connectionPool(connectionPool) { try { @@ -180,10 +180,10 @@ Instance::publisherReplicaProxy() const return _publisherReplicaProxy; } -DatabaseCachePtr -Instance::databaseCache() const +ConnectionPoolPtr +Instance::connectionPool() const { - return _databaseCache; + return _connectionPool; } IceUtil::Time |