Removed null permission verifier well-known objects Various fixes for

    replcia session establishment.

1 files changed, 3 insertions, 25 deletions

diff --git a/cpp/src/IceGrid/WellKnownObjectsManager.cpp b/cpp/src/IceGrid/WellKnownObjectsManager.cpp
index 25e0c9e52f6..fde27fc5bdb 100644
--- a/cpp/src/IceGrid/WellKnownObjectsManager.cpp
+++ b/cpp/src/IceGrid/WellKnownObjectsManager.cpp
@@ -72,19 +72,7 @@ WellKnownObjectsManager::registerAll()
     // If initialized, the endpoints and well known objects are immutable.
     //
     updateReplicatedWellKnownObjects();
-    registerWellKnownObjects(_wellKnownObjects);
-}
-
-void
-WellKnownObjectsManager::registerWellKnownObjects(const ObjectInfoSeq& objects)
-{
-    _database->addOrUpdateObjectsInDatabase(objects);
-}
-
-void
-WellKnownObjectsManager::unregisterWellKnownObjects(const ObjectInfoSeq& objects)
-{
-    _database->removeObjectsInDatabase(objects);
+    _database->addOrUpdateObjectsInDatabase(_wellKnownObjects);
 }
 
 void
@@ -103,6 +91,8 @@ WellKnownObjectsManager::updateReplicatedWellKnownObjects()
     ObjectInfo info;
     ObjectInfoSeq objects;
 
+    Lock sync(*this);
+
     Ice::ObjectPrx replicatedClientProxy = _database->getReplicatedEndpoints("Client", _endpoints["Client"]);
 
     id.name = "Query";
@@ -115,18 +105,6 @@ WellKnownObjectsManager::updateReplicatedWellKnownObjects()
     info.proxy = replicatedClientProxy->ice_identity(id);
     objects.push_back(info);
 
-    Ice::ObjectPrx replicatedInternalProxy = _database->getReplicatedEndpoints("Internal", _endpoints["Internal"]);
-
-    id.name = "NullPermissionsVerifier";
-    info.type = Glacier2::PermissionsVerifier::ice_staticId();
-    info.proxy = replicatedInternalProxy->ice_identity(id);
-    objects.push_back(info);
-
-    id.name = "NullSSLPermissionsVerifier";
-    info.type = Glacier2::SSLPermissionsVerifier::ice_staticId();
-    info.proxy = replicatedInternalProxy->ice_identity(id);
-    objects.push_back(info);
-
     _database->addOrUpdateObjectsInDatabase(objects);
 }