Skip to content

U
uniset2
Commit b5a34d4b authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

Configuration: use alternate arg of getPort

parent 62695cb7
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 17 deletions
src/Various/Configuration.cc
View file @ b5a34d4b
...@@ -341,15 +341,9 @@ void Configuration::initConfiguration( int argc, const char* const* argv ) ...@@ -341,15 +341,9 @@ void Configuration::initConfiguration( int argc, const char* const* argv )
new_argv[i] = "-ORBInitRef"; new_argv[i] = "-ORBInitRef";
new_argv[i+1] = ""; // (.. getArgParam) new_argv[i+1] = ""; // (.. getArgParam)
string defPort( getPort() ); // getArgParam! _argv string defPort( getPort( getProp(nsnode,"port") ) ); // getArgParam! _argv
if( defPort == UniSetDefaultPort ) ostringstream param;
defPort = getProp(nsnode,"port");
if( defPort.empty() )
defPort = UniSetDefaultPort;
ostringstream param;
param <<"NameService=corbaname::" << getProp(nsnode,"host") << ":" << defPort; param <<"NameService=corbaname::" << getProp(nsnode,"host") << ":" << defPort;
new_argv[i+1] = strdup(param.str().c_str()); new_argv[i+1] = strdup(param.str().c_str());
if( unideb.debugging(Debug::INFO) ) if( unideb.debugging(Debug::INFO) )
...@@ -616,17 +610,10 @@ void Configuration::createNodesList() ...@@ -616,17 +610,10 @@ void Configuration::createNodesList()
} }
UniXML_iterator it(node); UniXML_iterator it(node);
it.goChildren(); it.goChildren();
// //
string defPort(getPort()); string defPort(getPort(unixml.getProp(node,"port")));
if( defPort == UniSetDefaultPort )
defPort = unixml.getProp(node,"port");
// .
if( defPort.empty() )
defPort = UniSetDefaultPort;
lnodes.clear(); lnodes.clear();
for( ;it;it.goNext() ) for( ;it;it.goNext() )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment