diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2005-06-02 15:34:46 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2005-06-02 15:34:46 +0000 |
| commit | 2fa5eeac950a312d83b1d3bb7510d4e17f6777ff (patch) | |
| tree | 58588af8967f527433f4c7a7ba5c1112c33b3fcd /cpp/src/IceGrid/IceGridNode.cpp | |
| parent | minor fix (diff) | |
| download | ice-2fa5eeac950a312d83b1d3bb7510d4e17f6777ff.tar.bz2 ice-2fa5eeac950a312d83b1d3bb7510d4e17f6777ff.tar.xz ice-2fa5eeac950a312d83b1d3bb7510d4e17f6777ff.zip | |
Added support for targets attribute of the application, server and service
descriptors Ported IcePack fixes (configurable identities).
Diffstat (limited to 'cpp/src/IceGrid/IceGridNode.cpp')
| -rw-r--r-- | cpp/src/IceGrid/IceGridNode.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp index e67f5840605..b07cade381f 100644 --- a/cpp/src/IceGrid/IceGridNode.cpp +++ b/cpp/src/IceGrid/IceGridNode.cpp @@ -298,7 +298,9 @@ NodeService::start(int argc, char* argv[]) // collocated locator (this property is passed by the // activator to each activated server). // - string locatorPrx = "IceGrid/Locator:" + properties->getProperty("IceGrid.Registry.Client.Endpoints"); + const string locatorIdProperty = "IceGrid.Registry.LocatorIdentity"; + string locatorId = properties->getPropertyWithDefault(locatorIdProperty, "IceGrid/Locator"); + string locatorPrx = locatorId + ":" + properties->getProperty("IceGrid.Registry.Client.Endpoints"); properties->setProperty("Ice.Default.Locator", locatorPrx); } else if(properties->getProperty("Ice.Default.Locator").empty()) |