diff options
Diffstat (limited to 'cpp/src/IceGrid/IceGridRegistry.cpp')
| -rw-r--r-- | cpp/src/IceGrid/IceGridRegistry.cpp | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/IceGridRegistry.cpp b/cpp/src/IceGrid/IceGridRegistry.cpp index fc991d75c4c..b411ef459bc 100644 --- a/cpp/src/IceGrid/IceGridRegistry.cpp +++ b/cpp/src/IceGrid/IceGridRegistry.cpp @@ -129,7 +129,7 @@ RegistryService::start(int argc, char* argv[], int& status) TraceLevelsPtr traceLevels = new TraceLevels(communicator(), "IceGrid.Registry"); - _registry = new RegistryI(communicator(), traceLevels, nowarn, readonly, initFromReplica); + _registry = new RegistryI(communicator(), traceLevels, nowarn, readonly, initFromReplica, ""); if(!_registry->start()) { return false; @@ -191,7 +191,21 @@ RegistryService::initializeCommunicator(int& argc, char* argv[], } } } - + + + // + // Never create Admin object in Ice.Admin adapter + // + initData.properties->setProperty("Ice.Admin.Endpoints", ""); + + // + // Enable Admin unless explicitely disabled (or enabled) in configuration + // + if(initData.properties->getProperty("Ice.Admin.Enabled").empty()) + { + initData.properties->setProperty("Ice.Admin.Enabled", "1"); + } + // // Setup the client thread pool size. // @@ -202,6 +216,7 @@ RegistryService::initializeCommunicator(int& argc, char* argv[], // initData.properties->setProperty("Ice.ACM.Close", "3"); + return Service::initializeCommunicator(argc, argv, initData); } |