diff options
| author | Mark Spruiell <mes@zeroc.com> | 2007-09-20 13:31:17 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2007-09-20 13:31:17 -0700 |
| commit | 88784cb0ef3c6abcdfacf8fa2e5163f48c5acffc (patch) | |
| tree | 4c11a58a1140221011e78167aff165ef16cab553 /cpp/src/IceGrid/IceGridNode.cpp | |
| parent | minor cleanup in IcePy (diff) | |
| parent | Squashed commit of the following: (diff) | |
| download | ice-88784cb0ef3c6abcdfacf8fa2e5163f48c5acffc.tar.bz2 ice-88784cb0ef3c6abcdfacf8fa2e5163f48c5acffc.tar.xz ice-88784cb0ef3c6abcdfacf8fa2e5163f48c5acffc.zip | |
Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice
Diffstat (limited to 'cpp/src/IceGrid/IceGridNode.cpp')
| -rw-r--r-- | cpp/src/IceGrid/IceGridNode.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp index 4a2a6855847..f29fba8ca79 100644 --- a/cpp/src/IceGrid/IceGridNode.cpp +++ b/cpp/src/IceGrid/IceGridNode.cpp @@ -385,7 +385,7 @@ NodeService::start(int argc, char* argv[]) // // Create the node object adapter. // - properties->setProperty("IceGrid.Node.RegisterProcess", "0"); + properties->setProperty("IceGrid.Node.RegisterProcess", ""); properties->setProperty("IceGrid.Node.AdapterId", ""); _adapter = communicator()->createObjectAdapter("IceGrid.Node"); @@ -480,13 +480,13 @@ NodeService::start(int argc, char* argv[]) // Add a process servant to allow shutdown through the process // interface if a server id is set on the node. // - if(!properties->getProperty("Ice.ServerId").empty() && communicator()->getDefaultLocator()) + if(!properties->getProperty("Ice.Admin.ServerId").empty() && communicator()->getDefaultLocator()) { try { ProcessPrx proxy = ProcessPrx::uncheckedCast(_adapter->addWithUUID(new ProcessI(_activator))); LocatorRegistryPrx locatorRegistry = communicator()->getDefaultLocator()->getRegistry(); - locatorRegistry->setServerProcessProxy(properties->getProperty("Ice.ServerId"), proxy); + locatorRegistry->setServerProcessProxy(properties->getProperty("Ice.Admin.ServerId"), proxy); } catch(const ServerNotFoundException&) { |