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/Service.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/Service.cpp')
| -rw-r--r-- | cpp/src/IceStorm/Service.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/IceStorm/Service.cpp b/cpp/src/IceStorm/Service.cpp index 9bb02dc0b83..fa94c80619a 100644 --- a/cpp/src/IceStorm/Service.cpp +++ b/cpp/src/IceStorm/Service.cpp @@ -200,11 +200,11 @@ ServiceI::start( e.reason = s.str(); throw e; } - DatabaseCachePtr databaseCache = plugin->getDatabaseCache(name); + ConnectionPoolPtr connectionPool = plugin->getConnectionPool(name); if(id == -1) // No replication. { - _instance = new Instance(instanceName, name, communicator, databaseCache, publishAdapter, topicAdapter); + _instance = new Instance(instanceName, name, communicator, connectionPool, publishAdapter, topicAdapter); try { @@ -352,7 +352,7 @@ ServiceI::start( } Ice::ObjectAdapterPtr nodeAdapter = communicator->createObjectAdapter(name + ".Node"); - _instance = new Instance(instanceName, name, communicator, databaseCache, publishAdapter, topicAdapter, + _instance = new Instance(instanceName, name, communicator, connectionPool, publishAdapter, topicAdapter, nodeAdapter, nodes[id]); _instance->observers()->setMajority(static_cast<unsigned int>(nodes.size())/2); |