diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2005-10-13 18:56:58 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2005-10-13 18:56:58 +0000 |
| commit | 7a7876a5fb8fac3f771431ce54cc806e41d1b7cf (patch) | |
| tree | 65a2d56f7e3eb942bbb8c3fd2a7ca6ff069c909f /cpp/src/IceGrid/NodeI.cpp | |
| parent | Added editor for replica groups (diff) | |
| download | ice-7a7876a5fb8fac3f771431ce54cc806e41d1b7cf.tar.bz2 ice-7a7876a5fb8fac3f771431ce54cc806e41d1b7cf.tar.xz ice-7a7876a5fb8fac3f771431ce54cc806e41d1b7cf.zip | |
Removed identity properties
Added description attribute to replica group and node descriptors.
Diffstat (limited to 'cpp/src/IceGrid/NodeI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/NodeI.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/NodeI.cpp b/cpp/src/IceGrid/NodeI.cpp index 119fe61a7b8..25f96133ba8 100644 --- a/cpp/src/IceGrid/NodeI.cpp +++ b/cpp/src/IceGrid/NodeI.cpp @@ -469,8 +469,11 @@ NodeI::keepAlive() { try { - Ice::ObjectPrx object = getCommunicator()->stringToProxy("IceGrid/Registry@IceGrid.Registry.Internal"); - RegistryPrx registry = RegistryPrx::uncheckedCast(object); + Ice::PropertiesPtr properties = getCommunicator()->getProperties(); + const string instanceNameProperty = "IceGrid.InstanceName"; + string instanceName = properties->getPropertyWithDefault(instanceNameProperty, "IceGrid"); + Ice::ObjectPrx obj = getCommunicator()->stringToProxy(instanceName + "/Registry@IceGrid.Registry.Internal"); + RegistryPrx registry = RegistryPrx::uncheckedCast(obj); NodeObserverPrx observer; setSession(registry->registerNode(_name, _proxy, _platform.getNodeInfo(), observer), observer); checkConsistency(); |