From 930e9797f420ed538bc4e55ffeb76b8596e12715 Mon Sep 17 00:00:00 2001 From: Benoit Foucher Date: Fri, 11 Nov 2005 13:56:10 +0000 Subject: :activate() would contact the locator even if the OA id was empty. Fixed a bug where ${node.os} for example couldn't be used in distribution directories. Unknown elements in XML file are now treated as errors. --- cpp/src/IceGrid/IceGridNode.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cpp/src/IceGrid/IceGridNode.cpp') diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp index c1e88ca6f3b..1e51dd6d1a7 100644 --- a/cpp/src/IceGrid/IceGridNode.cpp +++ b/cpp/src/IceGrid/IceGridNode.cpp @@ -345,8 +345,8 @@ NodeService::start(int argc, char* argv[]) // activator to each activated server). // const string instanceNameProperty = "IceGrid.InstanceName"; - const string locatorId = properties->getPropertyWithDefault(instanceNameProperty, "IceGrid") + "/Locator"; - string locatorPrx = locatorId + ":" + properties->getProperty("IceGrid.Registry.Client.Endpoints"); + const string locatorId = properties->getPropertyWithDefault(instanceNameProperty, "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()) -- cgit v1.2.3