Configuration: use alternate arg of getPort

src/Various/Configuration.cc

@@ -341,13 +341,7 @@ void Configuration::initConfiguration( int argc, const char* const* argv )
 			new_argv[i] = "-ORBInitRef";
 
 			new_argv[i+1] 	= ""; //     (..   getArgParam)
-			string defPort( getPort() ); //   getArgParam!   _argv
-
-			if( defPort == UniSetDefaultPort )
-				defPort = getProp(nsnode,"port");
-		
-			if( defPort.empty() )
-				defPort = UniSetDefaultPort;
+			string defPort( getPort( getProp(nsnode,"port") ) ); //   getArgParam!   _argv
 
 			ostringstream param;
 			param <<"NameService=corbaname::" << getProp(nsnode,"host") << ":" << defPort;
@@ -619,14 +613,7 @@ void Configuration::createNodesList()
 	it.goChildren();
 
 	//  
-	string defPort(getPort());
-
-	if( defPort == UniSetDefaultPort )
-		defPort = unixml.getProp(node,"port");
-
-	//  .
-	if( defPort.empty() )
-		defPort = UniSetDefaultPort;
+	string defPort(getPort(unixml.getProp(node,"port")));
 
 	lnodes.clear();
 	for( ;it;it.goNext() )