fixed bug: http://bugs.etersoft.ru/show_bug.cgi?id=4319

conf/libuniset.spec

@@ -3,7 +3,7 @@
 
 Name: libuniset
 Version: 0.97
-Release: eter9
+Release: eter11
 Summary: UniSet - library for building distributed industrial control systems
 License: GPL
 Group: Development/C++
@@ -178,6 +178,12 @@ rm -f %buildroot%_libdir/*.la
 %exclude %_pkgconfigdir/libUniSet.pc
 
 %changelog
+* Wed Sep 23 2009 Pavel Vainerman <pv@altlinux.ru> 0.97-eter10
+- new build
+
+* Wed Sep 23 2009 Pavel Vainerman <pv@altlinux.ru> 0.97-eter9
+- new mutex
+
 * Tue Sep 22 2009 Pavel Vainerman <pv@etersoft.ru> 0.97-eter8
 - new build
 

extensions/SharedMemory/Makefile.am

@@ -5,6 +5,8 @@ libUniSetSharedMemory_la_LIBADD		= $(SIGC_LIBS) $(top_builddir)/lib/libUniSet.la
 	$(top_builddir)/extensions/lib/libUniSetExtensions.la
 libUniSetSharedMemory_la_CPPFLAGS	= $(SIGC_CFLAGS) -I$(top_builddir)/extensions/include
 libUniSetSharedMemory_la_SOURCES 	= SharedMemory.cc 
+#libUniSetSharedMemory_la_LDFLAGS	= -version-info @LIBVER@
+
 
 @PACKAGE@_smemory_LDADD 	= libUniSetSharedMemory.la
 @PACKAGE@_smemory_CPPFLAGS	= $(SIGC_CFLAGS) -I$(top_builddir)/extensions/include

src/Various/Configuration.cc

@@ -91,6 +91,7 @@ Configuration::Configuration():
 	localTimerService(UniSetTypes::DefaultObjectId),
 	localDBServer(UniSetTypes::DefaultObjectId),
 	localInfoServer(UniSetTypes::DefaultObjectId),
+	localNode(UniSetTypes::DefaultObjectId),
 	fileConfName("")
 {
 //	unideb[Debug::CRIT] << " configuration FAILED!!!!!!!!!!!!!!!!!" << endl;
@@ -133,6 +134,7 @@ Configuration::Configuration( int argc, const char* const* argv, const string xm
 	localTimerService(UniSetTypes::DefaultObjectId),
 	localDBServer(UniSetTypes::DefaultObjectId),
 	localInfoServer(UniSetTypes::DefaultObjectId),
+	localNode(UniSetTypes::DefaultObjectId),
 	fileConfName(xmlfile)
 {
 	if( xmlfile.empty() )
@@ -152,6 +154,7 @@ Configuration::Configuration( int argc, const char* const* argv, ObjectIndex* _o
 	localTimerService(UniSetTypes::DefaultObjectId),
 	localDBServer(UniSetTypes::DefaultObjectId),
 	localInfoServer(UniSetTypes::DefaultObjectId),
+	localNode(UniSetTypes::DefaultObjectId),
 	fileConfName(fileConf)
 {
 	if( fileConf.empty() )
@@ -172,6 +175,7 @@ Configuration::Configuration( int argc, const char* const* argv, const string fi
 	localTimerService(UniSetTypes::DefaultObjectId),
 	localDBServer(UniSetTypes::DefaultObjectId),
 	localInfoServer(UniSetTypes::DefaultObjectId),
+	localNode(UniSetTypes::DefaultObjectId),
 	fileConfName(fileConf)
 {
 	if( fileConf.empty() )
@@ -264,13 +268,12 @@ void Configuration::initConfiguration( int argc, const char* const* argv )
 		transientIOR 	= false;
 		localIOR 	= false;
 
-		initParameters();
-
-
 		string lnode( getArgParam("--localNode") );
 		if( !lnode.empty() )
 			setLocalNode(lnode);
 
+		initParameters();
+
 		// help
 //		if( !getArgParam("--help").empty() )
 //			help(cout);
@@ -455,8 +458,11 @@ void Configuration::initParameters()
 		
 		if( name == "LocalNode" )
 		{
-			string nodename( it.getProp("name") );
-			setLocalNode(nodename);
+			if( localNode == UniSetTypes::DefaultObjectId )
+			{
+				string nodename( it.getProp("name") );
+				setLocalNode(nodename);
+			}
 		}
 		else if( name == "LocalTimerService" )
 		{
@@ -567,8 +573,10 @@ void Configuration::setLocalNode( string nodename )
 
 	if( localNode == DefaultObjectId )
 	{
-		unideb[Debug::CRIT] << "(Configuration::setLocalNode): node '" << nodename << "' ?? ?????? ?????????????  ObjectsMap!!!" << endl;
-		throw Exception("(Configuration::setLocalNode): node '"+nodename+"' ?? ?????? ?????????????  ObjectsMap!!!");
+		stringstream err;
+		err << "(Configuration::setLocalNode): Not found node '" << nodename << "'";
+		unideb[Debug::CRIT] << err << endl;
+		throw Exception(err.str());
 	}
 	oind->initLocalNode(localNode);
 }