diff options
| author | Bernard Normier <bernard@zeroc.com> | 2007-09-20 15:55:05 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2007-09-20 15:55:05 -0400 |
| commit | f185946cfbced2bf5e6bf8deb0993a18057664d5 (patch) | |
| tree | 8a2de32151d5dc71bd0353feefa21de018e85f2f /cpp/src/IceGrid/IceGridNode.cpp | |
| parent | fix for compilation errors with Python 2.5 (diff) | |
| download | ice-f185946cfbced2bf5e6bf8deb0993a18057664d5.tar.bz2 ice-f185946cfbced2bf5e6bf8deb0993a18057664d5.tar.xz ice-f185946cfbced2bf5e6bf8deb0993a18057664d5.zip | |
Squashed commit of the following:
commit 2eba3087584d54d3ba98ef50724710fd34d84e0b
Author: Bernard Normier <bernard@zeroc.com>
Date: Thu Sep 20 15:53:49 2007 -0400
New ice-version attribute, IceGrid now generates Ice.Admin.* properties
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&) { |