diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2013-09-03 15:42:19 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2013-09-03 15:42:19 +0200 |
| commit | 91f6ebb998532b36fc70187b641a5b7404060422 (patch) | |
| tree | ac88e961c68e4b09eb819f4b57b9ecac56854567 /cpp/src/IceGrid/WellKnownObjectsManager.cpp | |
| parent | ICE-5378 - Remove slice35d.dll from Windows installer (diff) | |
| download | ice-91f6ebb998532b36fc70187b641a5b7404060422.tar.bz2 ice-91f6ebb998532b36fc70187b641a5b7404060422.tar.xz ice-91f6ebb998532b36fc70187b641a5b7404060422.zip | |
Fixed ICE-5358 - allow IceGrid replica to initialize its database from another replica
Diffstat (limited to 'cpp/src/IceGrid/WellKnownObjectsManager.cpp')
| -rw-r--r-- | cpp/src/IceGrid/WellKnownObjectsManager.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cpp/src/IceGrid/WellKnownObjectsManager.cpp b/cpp/src/IceGrid/WellKnownObjectsManager.cpp index a776955933b..f0b186541c8 100644 --- a/cpp/src/IceGrid/WellKnownObjectsManager.cpp +++ b/cpp/src/IceGrid/WellKnownObjectsManager.cpp @@ -15,8 +15,7 @@ using namespace std; using namespace IceGrid; WellKnownObjectsManager::WellKnownObjectsManager(const DatabasePtr& database) : - _database(database), - _initialized(false) + _database(database), _initialized(false) { } @@ -72,7 +71,7 @@ WellKnownObjectsManager::registerAll() // If initialized, the endpoints and well known objects are immutable. // updateReplicatedWellKnownObjects(); - _database->addOrUpdateObjectsInDatabase(_wellKnownObjects); + _database->addOrUpdateRegistryWellKnownObjects(_wellKnownObjects); } void @@ -105,7 +104,7 @@ WellKnownObjectsManager::updateReplicatedWellKnownObjects() info.proxy = replicatedClientProxy->ice_identity(id); objects.push_back(info); - _database->addOrUpdateObjectsInDatabase(objects); + _database->addOrUpdateRegistryWellKnownObjects(objects); } bool |