summaryrefslogtreecommitdiff
path: root/cpp/src/IcePack/IcePackNode.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2005-06-02 10:37:18 +0000
committerBenoit Foucher <benoit@zeroc.com>2005-06-02 10:37:18 +0000
commitb9ad5ee2d7f29cf02251b02e568772ed2312ccfb (patch)
tree1c5b1b54c4f17e280797fa14b06be65ea921fdb6 /cpp/src/IcePack/IcePackNode.cpp
parentBug 346. (diff)
downloadice-b9ad5ee2d7f29cf02251b02e568772ed2312ccfb.tar.bz2
ice-b9ad5ee2d7f29cf02251b02e568772ed2312ccfb.tar.xz
ice-b9ad5ee2d7f29cf02251b02e568772ed2312ccfb.zip
Fixed bug 258, 347, 352
Diffstat (limited to 'cpp/src/IcePack/IcePackNode.cpp')
-rw-r--r--cpp/src/IcePack/IcePackNode.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/cpp/src/IcePack/IcePackNode.cpp b/cpp/src/IcePack/IcePackNode.cpp
index d51ffc9a99f..3628fd5c45f 100644
--- a/cpp/src/IcePack/IcePackNode.cpp
+++ b/cpp/src/IcePack/IcePackNode.cpp
@@ -245,7 +245,9 @@ IcePack::NodeService::start(int argc, char* argv[])
// collocated locator (this property is passed by the
// activator to each activated server).
//
- string locatorPrx = "IcePack/Locator:" + properties->getProperty("IcePack.Registry.Client.Endpoints");
+ const string locatorIdProperty = "IcePack.Registry.LocatorIdentity";
+ string locatorId = properties->getPropertyWithDefault(locatorIdProperty, "IcePack/Locator");
+ string locatorPrx = locatorId + ":" + properties->getProperty("IcePack.Registry.Client.Endpoints");
properties->setProperty("Ice.Default.Locator", locatorPrx);
}
else if(properties->getProperty("Ice.Default.Locator").empty())