(UniSetObject): добавил std::terminate() если активация не удалась.

src/ObjectRepository/UniSetManager.cc

@@ -277,23 +277,60 @@ void UniSetManager::managers( OManagerCommand cmd )
 			}
 			catch( const uniset::Exception& ex )
 			{
-				ucrit << myname << "(managers): " << ex << endl
-					  << " Не смог зарегистрировать (разрегистрировать) объект -->" << li->getName() << endl;
+				ostringstream err;
+				err << myname << "(managers): " << ex << endl
+					  << " Не смог зарегистрировать (разрегистрировать) объект -->"
+					  << li->getName();
+
+				ucrit << err.str() << endl;
+
+				if( cmd == activ )
+				{
+					cerr << err.str();
+					std::terminate();
+				}
 			}
 			catch( const CORBA::SystemException& ex )
 			{
-				ucrit << myname << "(managers): поймали CORBA::SystemException:" << ex.NP_minorString() << endl;
+				ostringstream err;
+				err << myname << "(managers): поймали CORBA::SystemException:" << ex.NP_minorString();
+
+				ucrit << err.str() << endl;
+
+				if( cmd == activ )
+				{
+					cerr << err.str();
+					std::terminate();
+				}
 			}
 			catch( const CORBA::Exception& ex )
 			{
-				ucrit << myname << "(managers): Caught CORBA::Exception. " << ex._name() << endl;
+				ostringstream err;
+				err << myname << "(managers): Caught CORBA::Exception. "
+					  << ex._name()
+					  << " (" << li->getName() << ")";
+
+				ucrit << err.str() << endl;
+				if( cmd == activ )
+				{
+					cerr << err.str();
+					std::terminate();
+				}
 			}
 			catch( const omniORB::fatalException& fe )
 			{
-				ucrit << myname << "(managers): Caught omniORB::fatalException:" << endl;
-				ucrit << myname << "(managers): file: " << fe.file()
+				ostringstream err;
+				err << myname << "(managers): Caught omniORB::fatalException:" << endl
+					<< myname << "(managers): file: " << fe.file()
 					<< " line: " << fe.line()
-					  << " mesg: " << fe.errmsg() << endl;
+					<< " mesg: " << fe.errmsg();
+
+				ucrit << err.str() << endl;
+				if( cmd == activ )
+				{
+					cerr << err.str();
+					std::terminate();
+				}
 			}
 		}
 	} // unlock
@@ -355,13 +392,30 @@ void UniSetManager::objects(OManagerCommand cmd)
 			}
 			catch( const CORBA::SystemException& ex )
 			{
-				ucrit << myname << "(objects): поймали CORBA::SystemException:" << ex.NP_minorString() << endl;
+				ostringstream err;
+				err << myname << "(objects): поймали CORBA::SystemException:" << ex.NP_minorString();
+
+				ucrit << err.str() << endl;
+
+				if( cmd == activ )
+				{
+					cerr << err.str();
+					std::terminate();
+				}
 			}
 			catch( const CORBA::Exception& ex )
 			{
-				ucrit << myname << "(objects): Caught CORBA::Exception. "
+				ostringstream err;
+				err << myname << "(objects): Caught CORBA::Exception. "
 					  << ex._name()
-					  << " (" << li->getName() << ")" << endl;
+					  << " (" << li->getName() << ")";
+
+				ucrit << err.str() << endl;
+				if( cmd == activ )
+				{
+					cerr << err.str();
+					std::terminate();
+				}
 			}
 			catch( const omniORB::fatalException& fe )
 			{

src/ObjectRepository/UniSetObject.cc

@@ -283,6 +283,7 @@ void UniSetObject::registered()
 	catch( ORepFailed )
 	{
 		string err(myname + ": don`t registration in object reposotory");
+		uwarn << myname << "(registered):  " << err << endl;
 		throw ORepFailed(err);
 	}
 	catch( const uniset::Exception& ex )
@@ -570,6 +571,8 @@ bool UniSetObject::activate()
 		throw ORepFailed(err);
 	}
 
+	try
+	{
 		if( uniset_conf()->isTransientIOR() )
 		{
 			// activate witch generate id
@@ -598,6 +601,19 @@ bool UniSetObject::activate()
 			// Activate object...
 			poa->activate_object_with_id(oid, this);
 		}
+	}
+	catch( const CORBA::Exception& ex )
+	{
+		if( string(ex._name()) != "ObjectAlreadyActive" )
+		{
+			ostringstream err;
+			err << myname << "(activate): ACTIVATE ERROR: " << ex._name();
+			ucrit << myname << "(activate): " << err.str() << endl;
+			throw uniset::SystemError(err.str());
+		}
+
+		uwarn << myname << "(activate): IGNORE.. catch " << ex._name() << endl;
+	}
 
 	{
 		uniset::uniset_rwmutex_wrlock lock(refmutex);