ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-02-20 21:09:41 +05:00
Code Issues Packages Projects Releases Wiki Activity

remove memory leaks uninitalised memory read, etc...

Browse Source 
noticed with Rational Purify on Windows
This commit is contained in:
ptv 2006-07-14 05:53:36 +00:00
parent 4105fb6de3
commit e91811c2ef
9 changed files with 39 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/SMESHGUI/SMESHGUI.cxx
View File

@ -2788,7 +2788,7 @@ QString SMESHGUI::engineIOR() const
{ {
CORBA::ORB_var anORB = getApp()->orb(); CORBA::ORB_var anORB = getApp()->orb();
CORBA::String_var anIOR = anORB->object_to_string(GetSMESHGen()); CORBA::String_var anIOR = anORB->object_to_string(GetSMESHGen());
return anIOR.in(); return QString( anIOR.in() );
} }
void SMESHGUI::contextMenuPopup( const QString& client, QPopupMenu* menu, QString& /*title*/ ) void SMESHGUI::contextMenuPopup( const QString& client, QPopupMenu* menu, QString& /*title*/ )

43
src/SMESH_I/SMESH_Filter_i.cxx
View File

@ -452,11 +452,6 @@ static char* getShapeNameByID ( const char* theID )
Functor_i::Functor_i(): Functor_i::Functor_i():
SALOME::GenericObj_i( SMESH_Gen_i::GetPOA() ) SALOME::GenericObj_i( SMESH_Gen_i::GetPOA() )
{ {
// registration moved from constructor of abstract class
// to each ::Create* (creation of specific fucntor instance)
// to register fully declared this instance.
//PortableServer::ObjectId_var anObjectId =
// SMESH_Gen_i::GetPOA()->activate_object( this );
} }
Functor_i::~Functor_i() Functor_i::~Functor_i()
@ -1420,11 +1415,6 @@ FunctorType LogicalOR_i::GetFunctorType()
FilterManager_i::FilterManager_i() FilterManager_i::FilterManager_i()
: SALOME::GenericObj_i( SMESH_Gen_i::GetPOA() ) : SALOME::GenericObj_i( SMESH_Gen_i::GetPOA() )
{ {
// registration moved from constructor of abstract class
// to each ::Create* (creation of specific fucntor instance)
// to register fully declared this instance.
//PortableServer::ObjectId_var anObjectId =
// SMESH_Gen_i::GetPOA()->activate_object( this );
} }
@ -1437,7 +1427,6 @@ FilterManager_i::~FilterManager_i()
MinimumAngle_ptr FilterManager_i::CreateMinimumAngle() MinimumAngle_ptr FilterManager_i::CreateMinimumAngle()
{ {
SMESH::MinimumAngle_i* aServant = new SMESH::MinimumAngle_i(); SMESH::MinimumAngle_i* aServant = new SMESH::MinimumAngle_i();
SMESH_Gen_i::GetPOA()->activate_object( aServant );
SMESH::MinimumAngle_var anObj = aServant->_this(); SMESH::MinimumAngle_var anObj = aServant->_this();
TPythonDump()<<aServant<<" = "<<this<<".CreateMinimumAngle()"; TPythonDump()<<aServant<<" = "<<this<<".CreateMinimumAngle()";
return anObj._retn(); return anObj._retn();
@ -1447,7 +1436,6 @@ MinimumAngle_ptr FilterManager_i::CreateMinimumAngle()
AspectRatio_ptr FilterManager_i::CreateAspectRatio() AspectRatio_ptr FilterManager_i::CreateAspectRatio()
{ {
SMESH::AspectRatio_i* aServant = new SMESH::AspectRatio_i(); SMESH::AspectRatio_i* aServant = new SMESH::AspectRatio_i();
SMESH_Gen_i::GetPOA()->activate_object( aServant );
SMESH::AspectRatio_var anObj = aServant->_this(); SMESH::AspectRatio_var anObj = aServant->_this();
TPythonDump()<<aServant<<" = "<<this<<".CreateAspectRatio()"; TPythonDump()<<aServant<<" = "<<this<<".CreateAspectRatio()";
return anObj._retn(); return anObj._retn();
@ -1457,7 +1445,6 @@ AspectRatio_ptr FilterManager_i::CreateAspectRatio()
AspectRatio3D_ptr FilterManager_i::CreateAspectRatio3D() AspectRatio3D_ptr FilterManager_i::CreateAspectRatio3D()
{ {
SMESH::AspectRatio3D_i* aServant = new SMESH::AspectRatio3D_i(); SMESH::AspectRatio3D_i* aServant = new SMESH::AspectRatio3D_i();
SMESH_Gen_i::GetPOA()->activate_object( aServant );
SMESH::AspectRatio3D_var anObj = aServant->_this(); SMESH::AspectRatio3D_var anObj = aServant->_this();
TPythonDump()<<aServant<<" = "<<this<<".CreateAspectRatio3D()"; TPythonDump()<<aServant<<" = "<<this<<".CreateAspectRatio3D()";
return anObj._retn(); return anObj._retn();
@ -1467,7 +1454,6 @@ AspectRatio3D_ptr FilterManager_i::CreateAspectRatio3D()
Warping_ptr FilterManager_i::CreateWarping() Warping_ptr FilterManager_i::CreateWarping()
{ {
SMESH::Warping_i* aServant = new SMESH::Warping_i(); SMESH::Warping_i* aServant = new SMESH::Warping_i();
SMESH_Gen_i::GetPOA()->activate_object( aServant );
SMESH::Warping_var anObj = aServant->_this(); SMESH::Warping_var anObj = aServant->_this();
TPythonDump()<<aServant<<" = "<<this<<".CreateWarping()"; TPythonDump()<<aServant<<" = "<<this<<".CreateWarping()";
return anObj._retn(); return anObj._retn();
@ -1477,7 +1463,6 @@ Warping_ptr FilterManager_i::CreateWarping()
Taper_ptr FilterManager_i::CreateTaper() Taper_ptr FilterManager_i::CreateTaper()
{ {
SMESH::Taper_i* aServant = new SMESH::Taper_i(); SMESH::Taper_i* aServant = new SMESH::Taper_i();
SMESH_Gen_i::GetPOA()->activate_object( aServant );
SMESH::Taper_var anObj = aServant->_this(); SMESH::Taper_var anObj = aServant->_this();
TPythonDump()<<aServant<<" = "<<this<<".CreateTaper()"; TPythonDump()<<aServant<<" = "<<this<<".CreateTaper()";
return anObj._retn(); return anObj._retn();
@ -1487,7 +1472,6 @@ Taper_ptr FilterManager_i::CreateTaper()
Skew_ptr FilterManager_i::CreateSkew() Skew_ptr FilterManager_i::CreateSkew()
{ {
SMESH::Skew_i* aServant = new SMESH::Skew_i(); SMESH::Skew_i* aServant = new SMESH::Skew_i();
SMESH_Gen_i::GetPOA()->activate_object( aServant );
SMESH::Skew_var anObj = aServant->_this(); SMESH::Skew_var anObj = aServant->_this();
TPythonDump()<<aServant<<" = "<<this<<".CreateSkew()"; TPythonDump()<<aServant<<" = "<<this<<".CreateSkew()";
return anObj._retn(); return anObj._retn();
@ -1497,7 +1481,6 @@ Skew_ptr FilterManager_i::CreateSkew()
Area_ptr FilterManager_i::CreateArea() Area_ptr FilterManager_i::CreateArea()
{ {
SMESH::Area_i* aServant = new SMESH::Area_i(); SMESH::Area_i* aServant = new SMESH::Area_i();
SMESH_Gen_i::GetPOA()->activate_object( aServant );
SMESH::Area_var anObj = aServant->_this(); SMESH::Area_var anObj = aServant->_this();
TPythonDump()<<aServant<<" = "<<this<<".CreateArea()"; TPythonDump()<<aServant<<" = "<<this<<".CreateArea()";
return anObj._retn(); return anObj._retn();
@ -1507,7 +1490,6 @@ Area_ptr FilterManager_i::CreateArea()
Volume3D_ptr FilterManager_i::CreateVolume3D() Volume3D_ptr FilterManager_i::CreateVolume3D()
{ {
SMESH::Volume3D_i* aServant = new SMESH::Volume3D_i(); SMESH::Volume3D_i* aServant = new SMESH::Volume3D_i();
SMESH_Gen_i::GetPOA()->activate_object( aServant );
SMESH::Volume3D_var anObj = aServant->_this(); SMESH::Volume3D_var anObj = aServant->_this();
TPythonDump()<<aServant<<" = "<<this<<".CreateVolume3D()"; TPythonDump()<<aServant<<" = "<<this<<".CreateVolume3D()";
return anObj._retn(); return anObj._retn();
@ -1517,7 +1499,6 @@ Volume3D_ptr FilterManager_i::CreateVolume3D()
Length_ptr FilterManager_i::CreateLength() Length_ptr FilterManager_i::CreateLength()
{ {
SMESH::Length_i* aServant = new SMESH::Length_i(); SMESH::Length_i* aServant = new SMESH::Length_i();
SMESH_Gen_i::GetPOA()->activate_object( aServant );
SMESH::Length_var anObj = aServant->_this(); SMESH::Length_var anObj = aServant->_this();
TPythonDump()<<aServant<<" = "<<this<<".CreateLength()"; TPythonDump()<<aServant<<" = "<<this<<".CreateLength()";
return anObj._retn(); return anObj._retn();
@ -1526,7 +1507,6 @@ Length_ptr FilterManager_i::CreateLength()
Length2D_ptr FilterManager_i::CreateLength2D() Length2D_ptr FilterManager_i::CreateLength2D()
{ {
SMESH::Length2D_i* aServant = new SMESH::Length2D_i(); SMESH::Length2D_i* aServant = new SMESH::Length2D_i();
SMESH_Gen_i::GetPOA()->activate_object( aServant );
SMESH::Length2D_var anObj = aServant->_this(); SMESH::Length2D_var anObj = aServant->_this();
TPythonDump()<<aServant<<" = "<<this<<".CreateLength2D()"; TPythonDump()<<aServant<<" = "<<this<<".CreateLength2D()";
return anObj._retn(); return anObj._retn();
@ -1535,7 +1515,6 @@ Length2D_ptr FilterManager_i::CreateLength2D()
MultiConnection_ptr FilterManager_i::CreateMultiConnection() MultiConnection_ptr FilterManager_i::CreateMultiConnection()
{ {
SMESH::MultiConnection_i* aServant = new SMESH::MultiConnection_i(); SMESH::MultiConnection_i* aServant = new SMESH::MultiConnection_i();
SMESH_Gen_i::GetPOA()->activate_object( aServant );
SMESH::MultiConnection_var anObj = aServant->_this(); SMESH::MultiConnection_var anObj = aServant->_this();
TPythonDump()<<aServant<<" = "<<this<<".CreateMultiConnection()"; TPythonDump()<<aServant<<" = "<<this<<".CreateMultiConnection()";
return anObj._retn(); return anObj._retn();
@ -1544,7 +1523,6 @@ MultiConnection_ptr FilterManager_i::CreateMultiConnection()
MultiConnection2D_ptr FilterManager_i::CreateMultiConnection2D() MultiConnection2D_ptr FilterManager_i::CreateMultiConnection2D()
{ {
SMESH::MultiConnection2D_i* aServant = new SMESH::MultiConnection2D_i(); SMESH::MultiConnection2D_i* aServant = new SMESH::MultiConnection2D_i();
SMESH_Gen_i::GetPOA()->activate_object( aServant );
SMESH::MultiConnection2D_var anObj = aServant->_this(); SMESH::MultiConnection2D_var anObj = aServant->_this();
TPythonDump()<<aServant<<" = "<<this<<".CreateMultiConnection2D()"; TPythonDump()<<aServant<<" = "<<this<<".CreateMultiConnection2D()";
return anObj._retn(); return anObj._retn();
@ -1553,7 +1531,6 @@ MultiConnection2D_ptr FilterManager_i::CreateMultiConnection2D()
BelongToGeom_ptr FilterManager_i::CreateBelongToGeom() BelongToGeom_ptr FilterManager_i::CreateBelongToGeom()
{ {
SMESH::BelongToGeom_i* aServant = new SMESH::BelongToGeom_i(); SMESH::BelongToGeom_i* aServant = new SMESH::BelongToGeom_i();
SMESH_Gen_i::GetPOA()->activate_object( aServant );
SMESH::BelongToGeom_var anObj = aServant->_this(); SMESH::BelongToGeom_var anObj = aServant->_this();
TPythonDump()<<aServant<<" = "<<this<<".CreateBelongToGeom()"; TPythonDump()<<aServant<<" = "<<this<<".CreateBelongToGeom()";
return anObj._retn(); return anObj._retn();
@ -1562,7 +1539,6 @@ BelongToGeom_ptr FilterManager_i::CreateBelongToGeom()
BelongToPlane_ptr FilterManager_i::CreateBelongToPlane() BelongToPlane_ptr FilterManager_i::CreateBelongToPlane()
{ {
SMESH::BelongToPlane_i* aServant = new SMESH::BelongToPlane_i(); SMESH::BelongToPlane_i* aServant = new SMESH::BelongToPlane_i();
SMESH_Gen_i::GetPOA()->activate_object( aServant );
SMESH::BelongToPlane_var anObj = aServant->_this(); SMESH::BelongToPlane_var anObj = aServant->_this();
TPythonDump()<<aServant<<" = "<<this<<".CreateBelongToPlane()"; TPythonDump()<<aServant<<" = "<<this<<".CreateBelongToPlane()";
return anObj._retn(); return anObj._retn();
@ -1571,7 +1547,6 @@ BelongToPlane_ptr FilterManager_i::CreateBelongToPlane()
BelongToCylinder_ptr FilterManager_i::CreateBelongToCylinder() BelongToCylinder_ptr FilterManager_i::CreateBelongToCylinder()
{ {
SMESH::BelongToCylinder_i* aServant = new SMESH::BelongToCylinder_i(); SMESH::BelongToCylinder_i* aServant = new SMESH::BelongToCylinder_i();
SMESH_Gen_i::GetPOA()->activate_object( aServant );
SMESH::BelongToCylinder_var anObj = aServant->_this(); SMESH::BelongToCylinder_var anObj = aServant->_this();
TPythonDump()<<aServant<<" = "<<this<<".CreateBelongToCylinder()"; TPythonDump()<<aServant<<" = "<<this<<".CreateBelongToCylinder()";
return anObj._retn(); return anObj._retn();
@ -1580,7 +1555,6 @@ BelongToCylinder_ptr FilterManager_i::CreateBelongToCylinder()
LyingOnGeom_ptr FilterManager_i::CreateLyingOnGeom() LyingOnGeom_ptr FilterManager_i::CreateLyingOnGeom()
{ {
SMESH::LyingOnGeom_i* aServant = new SMESH::LyingOnGeom_i(); SMESH::LyingOnGeom_i* aServant = new SMESH::LyingOnGeom_i();
SMESH_Gen_i::GetPOA()->activate_object( aServant );
SMESH::LyingOnGeom_var anObj = aServant->_this(); SMESH::LyingOnGeom_var anObj = aServant->_this();
TPythonDump()<<aServant<<" = "<<this<<".CreateLyingOnGeom()"; TPythonDump()<<aServant<<" = "<<this<<".CreateLyingOnGeom()";
return anObj._retn(); return anObj._retn();
@ -1589,7 +1563,6 @@ LyingOnGeom_ptr FilterManager_i::CreateLyingOnGeom()
FreeBorders_ptr FilterManager_i::CreateFreeBorders() FreeBorders_ptr FilterManager_i::CreateFreeBorders()
{ {
SMESH::FreeBorders_i* aServant = new SMESH::FreeBorders_i(); SMESH::FreeBorders_i* aServant = new SMESH::FreeBorders_i();
SMESH_Gen_i::GetPOA()->activate_object( aServant );
SMESH::FreeBorders_var anObj = aServant->_this(); SMESH::FreeBorders_var anObj = aServant->_this();
TPythonDump()<<aServant<<" = "<<this<<".CreateFreeBorders()"; TPythonDump()<<aServant<<" = "<<this<<".CreateFreeBorders()";
return anObj._retn(); return anObj._retn();
@ -1598,7 +1571,6 @@ FreeBorders_ptr FilterManager_i::CreateFreeBorders()
FreeEdges_ptr FilterManager_i::CreateFreeEdges() FreeEdges_ptr FilterManager_i::CreateFreeEdges()
{ {
SMESH::FreeEdges_i* aServant = new SMESH::FreeEdges_i(); SMESH::FreeEdges_i* aServant = new SMESH::FreeEdges_i();
SMESH_Gen_i::GetPOA()->activate_object( aServant );
SMESH::FreeEdges_var anObj = aServant->_this(); SMESH::FreeEdges_var anObj = aServant->_this();
TPythonDump()<<aServant<<" = "<<this<<".CreateFreeEdges()"; TPythonDump()<<aServant<<" = "<<this<<".CreateFreeEdges()";
return anObj._retn(); return anObj._retn();
@ -1607,7 +1579,6 @@ FreeEdges_ptr FilterManager_i::CreateFreeEdges()
RangeOfIds_ptr FilterManager_i::CreateRangeOfIds() RangeOfIds_ptr FilterManager_i::CreateRangeOfIds()
{ {
SMESH::RangeOfIds_i* aServant = new SMESH::RangeOfIds_i(); SMESH::RangeOfIds_i* aServant = new SMESH::RangeOfIds_i();
SMESH_Gen_i::GetPOA()->activate_object( aServant );
SMESH::RangeOfIds_var anObj = aServant->_this(); SMESH::RangeOfIds_var anObj = aServant->_this();
TPythonDump()<<aServant<<" = "<<this<<".CreateRangeOfIds()"; TPythonDump()<<aServant<<" = "<<this<<".CreateRangeOfIds()";
return anObj._retn(); return anObj._retn();
@ -1616,7 +1587,6 @@ RangeOfIds_ptr FilterManager_i::CreateRangeOfIds()
BadOrientedVolume_ptr FilterManager_i::CreateBadOrientedVolume() BadOrientedVolume_ptr FilterManager_i::CreateBadOrientedVolume()
{ {
SMESH::BadOrientedVolume_i* aServant = new SMESH::BadOrientedVolume_i(); SMESH::BadOrientedVolume_i* aServant = new SMESH::BadOrientedVolume_i();
SMESH_Gen_i::GetPOA()->activate_object( aServant );
SMESH::BadOrientedVolume_var anObj = aServant->_this(); SMESH::BadOrientedVolume_var anObj = aServant->_this();
TPythonDump()<<aServant<<" = "<<this<<".CreateBadOrientedVolume()"; TPythonDump()<<aServant<<" = "<<this<<".CreateBadOrientedVolume()";
return anObj._retn(); return anObj._retn();
@ -1625,7 +1595,6 @@ BadOrientedVolume_ptr FilterManager_i::CreateBadOrientedVolume()
LessThan_ptr FilterManager_i::CreateLessThan() LessThan_ptr FilterManager_i::CreateLessThan()
{ {
SMESH::LessThan_i* aServant = new SMESH::LessThan_i(); SMESH::LessThan_i* aServant = new SMESH::LessThan_i();
SMESH_Gen_i::GetPOA()->activate_object( aServant );
SMESH::LessThan_var anObj = aServant->_this(); SMESH::LessThan_var anObj = aServant->_this();
TPythonDump()<<aServant<<" = "<<this<<".CreateLessThan()"; TPythonDump()<<aServant<<" = "<<this<<".CreateLessThan()";
return anObj._retn(); return anObj._retn();
@ -1635,7 +1604,6 @@ LessThan_ptr FilterManager_i::CreateLessThan()
MoreThan_ptr FilterManager_i::CreateMoreThan() MoreThan_ptr FilterManager_i::CreateMoreThan()
{ {
SMESH::MoreThan_i* aServant = new SMESH::MoreThan_i(); SMESH::MoreThan_i* aServant = new SMESH::MoreThan_i();
SMESH_Gen_i::GetPOA()->activate_object( aServant );
SMESH::MoreThan_var anObj = aServant->_this(); SMESH::MoreThan_var anObj = aServant->_this();
TPythonDump()<<aServant<<" = "<<this<<".CreateMoreThan()"; TPythonDump()<<aServant<<" = "<<this<<".CreateMoreThan()";
return anObj._retn(); return anObj._retn();
@ -1644,7 +1612,6 @@ MoreThan_ptr FilterManager_i::CreateMoreThan()
EqualTo_ptr FilterManager_i::CreateEqualTo() EqualTo_ptr FilterManager_i::CreateEqualTo()
{ {
SMESH::EqualTo_i* aServant = new SMESH::EqualTo_i(); SMESH::EqualTo_i* aServant = new SMESH::EqualTo_i();
SMESH_Gen_i::GetPOA()->activate_object( aServant );
SMESH::EqualTo_var anObj = aServant->_this(); SMESH::EqualTo_var anObj = aServant->_this();
TPythonDump()<<aServant<<" = "<<this<<".CreateEqualTo()"; TPythonDump()<<aServant<<" = "<<this<<".CreateEqualTo()";
return anObj._retn(); return anObj._retn();
@ -1654,7 +1621,6 @@ EqualTo_ptr FilterManager_i::CreateEqualTo()
LogicalNOT_ptr FilterManager_i::CreateLogicalNOT() LogicalNOT_ptr FilterManager_i::CreateLogicalNOT()
{ {
SMESH::LogicalNOT_i* aServant = new SMESH::LogicalNOT_i(); SMESH::LogicalNOT_i* aServant = new SMESH::LogicalNOT_i();
SMESH_Gen_i::GetPOA()->activate_object( aServant );
SMESH::LogicalNOT_var anObj = aServant->_this(); SMESH::LogicalNOT_var anObj = aServant->_this();
TPythonDump()<<aServant<<" = "<<this<<".CreateLogicalNOT()"; TPythonDump()<<aServant<<" = "<<this<<".CreateLogicalNOT()";
return anObj._retn(); return anObj._retn();
@ -1664,7 +1630,6 @@ LogicalNOT_ptr FilterManager_i::CreateLogicalNOT()
LogicalAND_ptr FilterManager_i::CreateLogicalAND() LogicalAND_ptr FilterManager_i::CreateLogicalAND()
{ {
SMESH::LogicalAND_i* aServant = new SMESH::LogicalAND_i(); SMESH::LogicalAND_i* aServant = new SMESH::LogicalAND_i();
SMESH_Gen_i::GetPOA()->activate_object( aServant );
SMESH::LogicalAND_var anObj = aServant->_this(); SMESH::LogicalAND_var anObj = aServant->_this();
TPythonDump()<<aServant<<" = "<<this<<".CreateLogicalAND()"; TPythonDump()<<aServant<<" = "<<this<<".CreateLogicalAND()";
return anObj._retn(); return anObj._retn();
@ -1674,7 +1639,6 @@ LogicalAND_ptr FilterManager_i::CreateLogicalAND()
LogicalOR_ptr FilterManager_i::CreateLogicalOR() LogicalOR_ptr FilterManager_i::CreateLogicalOR()
{ {
SMESH::LogicalOR_i* aServant = new SMESH::LogicalOR_i(); SMESH::LogicalOR_i* aServant = new SMESH::LogicalOR_i();
SMESH_Gen_i::GetPOA()->activate_object( aServant );
SMESH::LogicalOR_var anObj = aServant->_this(); SMESH::LogicalOR_var anObj = aServant->_this();
TPythonDump()<<aServant<<" = "<<this<<".CreateLogicalOR()"; TPythonDump()<<aServant<<" = "<<this<<".CreateLogicalOR()";
return anObj._retn(); return anObj._retn();
@ -1683,7 +1647,6 @@ LogicalOR_ptr FilterManager_i::CreateLogicalOR()
Filter_ptr FilterManager_i::CreateFilter() Filter_ptr FilterManager_i::CreateFilter()
{ {
SMESH::Filter_i* aServant = new SMESH::Filter_i(); SMESH::Filter_i* aServant = new SMESH::Filter_i();
SMESH_Gen_i::GetPOA()->activate_object( aServant );
SMESH::Filter_var anObj = aServant->_this(); SMESH::Filter_var anObj = aServant->_this();
TPythonDump()<<aServant<<" = "<<this<<".CreateFilter()"; TPythonDump()<<aServant<<" = "<<this<<".CreateFilter()";
return anObj._retn(); return anObj._retn();
@ -1692,7 +1655,6 @@ Filter_ptr FilterManager_i::CreateFilter()
FilterLibrary_ptr FilterManager_i::LoadLibrary( const char* aFileName ) FilterLibrary_ptr FilterManager_i::LoadLibrary( const char* aFileName )
{ {
SMESH::FilterLibrary_i* aServant = new SMESH::FilterLibrary_i( aFileName ); SMESH::FilterLibrary_i* aServant = new SMESH::FilterLibrary_i( aFileName );
SMESH_Gen_i::GetPOA()->activate_object( aServant );
SMESH::FilterLibrary_var anObj = aServant->_this(); SMESH::FilterLibrary_var anObj = aServant->_this();
TPythonDump()<<aServant<<" = "<<this<<".LoadLibrary("<<aFileName<<")"; TPythonDump()<<aServant<<" = "<<this<<".LoadLibrary("<<aFileName<<")";
return anObj._retn(); return anObj._retn();
@ -1701,7 +1663,6 @@ FilterLibrary_ptr FilterManager_i::LoadLibrary( const char* aFileName )
FilterLibrary_ptr FilterManager_i::CreateLibrary() FilterLibrary_ptr FilterManager_i::CreateLibrary()
{ {
SMESH::FilterLibrary_i* aServant = new SMESH::FilterLibrary_i(); SMESH::FilterLibrary_i* aServant = new SMESH::FilterLibrary_i();
SMESH_Gen_i::GetPOA()->activate_object( aServant );
SMESH::FilterLibrary_var anObj = aServant->_this(); SMESH::FilterLibrary_var anObj = aServant->_this();
TPythonDump()<<aServant<<" = "<<this<<".CreateLibrary()"; TPythonDump()<<aServant<<" = "<<this<<".CreateLibrary()";
return anObj._retn(); return anObj._retn();
@ -1724,7 +1685,6 @@ CORBA::Boolean FilterManager_i::DeleteLibrary( const char* aFileName )
SMESH::FilterManager_ptr SMESH_Gen_i::CreateFilterManager() SMESH::FilterManager_ptr SMESH_Gen_i::CreateFilterManager()
{ {
SMESH::FilterManager_i* aFilter = new SMESH::FilterManager_i(); SMESH::FilterManager_i* aFilter = new SMESH::FilterManager_i();
SMESH_Gen_i::GetPOA()->activate_object( aFilter );
SMESH::FilterManager_var anObj = aFilter->_this(); SMESH::FilterManager_var anObj = aFilter->_this();
return anObj._retn(); return anObj._retn();
} }
@ -2023,7 +1983,6 @@ CORBA::Boolean Filter_i::SetCriteria( const SMESH::Filter::Criteria& theCriteria
myPredicate->Destroy(); myPredicate->Destroy();
SMESH::FilterManager_i* aFilter = new SMESH::FilterManager_i(); SMESH::FilterManager_i* aFilter = new SMESH::FilterManager_i();
SMESH_Gen_i::GetPOA()->activate_object( aFilter );
FilterManager_ptr aFilterMgr = aFilter->_this(); FilterManager_ptr aFilterMgr = aFilter->_this();
// CREATE two lists ( PREDICATES and LOG OP ) // CREATE two lists ( PREDICATES and LOG OP )
@ -2575,7 +2534,6 @@ FilterLibrary_i::FilterLibrary_i( const char* theFileName )
{ {
myFileName = strdup( theFileName ); myFileName = strdup( theFileName );
SMESH::FilterManager_i* aFilterMgr = new SMESH::FilterManager_i(); SMESH::FilterManager_i* aFilterMgr = new SMESH::FilterManager_i();
SMESH_Gen_i::GetPOA()->activate_object( aFilterMgr );
myFilterMgr = aFilterMgr->_this(); myFilterMgr = aFilterMgr->_this();
LDOMParser aParser; LDOMParser aParser;
@ -2608,7 +2566,6 @@ FilterLibrary_i::FilterLibrary_i()
{ {
myFileName = 0; myFileName = 0;
SMESH::FilterManager_i* aFilter = new SMESH::FilterManager_i(); SMESH::FilterManager_i* aFilter = new SMESH::FilterManager_i();
SMESH_Gen_i::GetPOA()->activate_object( aFilter );
myFilterMgr = aFilter->_this(); myFilterMgr = aFilter->_this();
myDoc = LDOM_Document::createDocument( LDOMString() ); myDoc = LDOM_Document::createDocument( LDOMString() );

53
src/SMESH_I/SMESH_Gen_i.cxx
View File

@ -384,8 +384,6 @@ SMESH::SMESH_Hypothesis_ptr SMESH_Gen_i::createHypothesis(const char* theHypName
if(MYDEBUG) MESSAGE("Create Hypothesis " << theHypName); if(MYDEBUG) MESSAGE("Create Hypothesis " << theHypName);
myHypothesis_i = myHypothesis_i =
myHypCreatorMap[string(theHypName)]->Create (myPoa, GetCurrentStudyID(), &myGen); myHypCreatorMap[string(theHypName)]->Create (myPoa, GetCurrentStudyID(), &myGen);
// _CS_gbo Explicit activation (no longer made in the constructor).
myHypothesis_i->Activate();
myHypothesis_i->SetLibName(aPlatformLibName/*theLibName*/); // for persistency assurance myHypothesis_i->SetLibName(aPlatformLibName/*theLibName*/); // for persistency assurance
} }
catch (SALOME_Exception& S_ex) catch (SALOME_Exception& S_ex)
@ -1302,7 +1300,8 @@ SALOMEDS::TMPFile* SMESH_Gen_i::Save( SALOMEDS::SComponent_ptr theComponent,
if ( myImpl ) { if ( myImpl ) {
string hypname = string( myHyp->GetName() ); string hypname = string( myHyp->GetName() );
string libname = string( myHyp->GetLibName() ); string libname = string( myHyp->GetLibName() );
int id = myStudyContext->findId( string( GetORB()->object_to_string( anObject ) ) ); CORBA::String_var objStr = GetORB()->object_to_string( anObject );
int id = myStudyContext->findId( string( objStr.in() ) );
string hypdata = string( myImpl->SaveTo() ); string hypdata = string( myImpl->SaveTo() );
// for each hypothesis create HDF group basing on its id // for each hypothesis create HDF group basing on its id
@ -1355,7 +1354,8 @@ SALOMEDS::TMPFile* SMESH_Gen_i::Save( SALOMEDS::SComponent_ptr theComponent,
if ( myImpl ) { if ( myImpl ) {
string hypname = string( myHyp->GetName() ); string hypname = string( myHyp->GetName() );
string libname = string( myHyp->GetLibName() ); string libname = string( myHyp->GetLibName() );
int id = myStudyContext->findId( string( GetORB()->object_to_string( anObject ) ) ); CORBA::String_var objStr = GetORB()->object_to_string( anObject );
int id = myStudyContext->findId( string( objStr.in() ) );
string hypdata = string( myImpl->SaveTo() ); string hypdata = string( myImpl->SaveTo() );
// for each algorithm create HDF group basing on its id // for each algorithm create HDF group basing on its id
@ -1398,7 +1398,8 @@ SALOMEDS::TMPFile* SMESH_Gen_i::Save( SALOMEDS::SComponent_ptr theComponent,
if ( !myMesh->_is_nil() ) { if ( !myMesh->_is_nil() ) {
SMESH_Mesh_i* myImpl = dynamic_cast<SMESH_Mesh_i*>( GetServant( myMesh ).in() ); SMESH_Mesh_i* myImpl = dynamic_cast<SMESH_Mesh_i*>( GetServant( myMesh ).in() );
if ( myImpl ) { if ( myImpl ) {
int id = myStudyContext->findId( string( GetORB()->object_to_string( anObject ) ) ); CORBA::String_var objStr = GetORB()->object_to_string( anObject );
int id = myStudyContext->findId( string( objStr.in() ) );
::SMESH_Mesh& myLocMesh = myImpl->GetImpl(); ::SMESH_Mesh& myLocMesh = myImpl->GetImpl();
SMESHDS_Mesh* mySMESHDSMesh = myLocMesh.GetMeshDS(); SMESHDS_Mesh* mySMESHDSMesh = myLocMesh.GetMeshDS();
@ -1467,7 +1468,8 @@ SALOMEDS::TMPFile* SMESH_Gen_i::Save( SALOMEDS::SComponent_ptr theComponent,
//string myRefOnObject = myRefOnHyp->GetID(); //string myRefOnObject = myRefOnHyp->GetID();
CORBA::Object_var anObject = SObjectToObject( myRefOnHyp ); CORBA::Object_var anObject = SObjectToObject( myRefOnHyp );
int id = myStudyContext->findId( string( GetORB()->object_to_string( anObject ) ) ); CORBA::String_var objStr = GetORB()->object_to_string( anObject );
int id = myStudyContext->findId( string( objStr.in() ) );
//if ( myRefOnObject.length() > 0 ) { //if ( myRefOnObject.length() > 0 ) {
//aSize[ 0 ] = myRefOnObject.length() + 1; //aSize[ 0 ] = myRefOnObject.length() + 1;
char hypName[ 30 ], hypId[ 30 ]; char hypName[ 30 ], hypId[ 30 ];
@ -1509,7 +1511,8 @@ SALOMEDS::TMPFile* SMESH_Gen_i::Save( SALOMEDS::SComponent_ptr theComponent,
//string myRefOnObject = myRefOnAlgo->GetID(); //string myRefOnObject = myRefOnAlgo->GetID();
CORBA::Object_var anObject = SObjectToObject( myRefOnAlgo ); CORBA::Object_var anObject = SObjectToObject( myRefOnAlgo );
int id = myStudyContext->findId( string( GetORB()->object_to_string( anObject ) ) ); CORBA::String_var objStr = GetORB()->object_to_string( anObject );
int id = myStudyContext->findId( string( objStr.in() ) );
//if ( myRefOnObject.length() > 0 ) { //if ( myRefOnObject.length() > 0 ) {
//aSize[ 0 ] = myRefOnObject.length() + 1; //aSize[ 0 ] = myRefOnObject.length() + 1;
char algoName[ 30 ], algoId[ 30 ]; char algoName[ 30 ], algoId[ 30 ];
@ -1599,7 +1602,8 @@ SALOMEDS::TMPFile* SMESH_Gen_i::Save( SALOMEDS::SComponent_ptr theComponent,
if ( !CORBA::is_nil( anSubObject )) if ( !CORBA::is_nil( anSubObject ))
{ {
SMESH::SMESH_subMesh_var mySubMesh = SMESH::SMESH_subMesh::_narrow( anSubObject ) ; SMESH::SMESH_subMesh_var mySubMesh = SMESH::SMESH_subMesh::_narrow( anSubObject ) ;
int subid = myStudyContext->findId( string( GetORB()->object_to_string( anSubObject ) ) ); CORBA::String_var objStr = GetORB()->object_to_string( anSubObject );
int subid = myStudyContext->findId( string( objStr.in() ) );
// for each mesh open the HDF group basing on its id // for each mesh open the HDF group basing on its id
char submeshGrpName[ 30 ]; char submeshGrpName[ 30 ];
@ -1636,7 +1640,8 @@ SALOMEDS::TMPFile* SMESH_Gen_i::Save( SALOMEDS::SComponent_ptr theComponent,
if ( ok ) { if ( ok ) {
//string myRefOnObject = myRefOnHyp->GetID(); //string myRefOnObject = myRefOnHyp->GetID();
CORBA::Object_var anObject = SObjectToObject( myRefOnHyp ); CORBA::Object_var anObject = SObjectToObject( myRefOnHyp );
int id = myStudyContext->findId( string( GetORB()->object_to_string( anObject ) ) ); CORBA::String_var objStr = GetORB()->object_to_string( anObject );
int id = myStudyContext->findId( string( objStr.in() ) );
//if ( myRefOnObject.length() > 0 ) { //if ( myRefOnObject.length() > 0 ) {
//aSize[ 0 ] = myRefOnObject.length() + 1; //aSize[ 0 ] = myRefOnObject.length() + 1;
char hypName[ 30 ], hypId[ 30 ]; char hypName[ 30 ], hypId[ 30 ];
@ -1670,7 +1675,8 @@ SALOMEDS::TMPFile* SMESH_Gen_i::Save( SALOMEDS::SComponent_ptr theComponent,
if ( ok ) { if ( ok ) {
//string myRefOnObject = myRefOnAlgo->GetID(); //string myRefOnObject = myRefOnAlgo->GetID();
CORBA::Object_var anObject = SObjectToObject( myRefOnAlgo ); CORBA::Object_var anObject = SObjectToObject( myRefOnAlgo );
int id = myStudyContext->findId( string( GetORB()->object_to_string( anObject ) ) ); CORBA::String_var objStr = GetORB()->object_to_string( anObject );
int id = myStudyContext->findId( string( objStr.in() ) );
//if ( myRefOnObject.length() > 0 ) { //if ( myRefOnObject.length() > 0 ) {
//aSize[ 0 ] = myRefOnObject.length() + 1; //aSize[ 0 ] = myRefOnObject.length() + 1;
char algoName[ 30 ], algoId[ 30 ]; char algoName[ 30 ], algoId[ 30 ];
@ -1727,7 +1733,8 @@ SALOMEDS::TMPFile* SMESH_Gen_i::Save( SALOMEDS::SComponent_ptr theComponent,
if ( !myGroupImpl ) if ( !myGroupImpl )
continue; continue;
int anId = myStudyContext->findId( string( GetORB()->object_to_string( aSubObject ) ) ); CORBA::String_var objStr = GetORB()->object_to_string( aSubObject );
int anId = myStudyContext->findId( string( objStr.in() ) );
// For each group, create a dataset named "Group <group_persistent_id>" // For each group, create a dataset named "Group <group_persistent_id>"
// and store the group's user name into it // and store the group's user name into it
@ -2148,8 +2155,8 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent,
SMESH_Hypothesis_i* myImpl = dynamic_cast<SMESH_Hypothesis_i*>( GetServant( myHyp ).in() ); SMESH_Hypothesis_i* myImpl = dynamic_cast<SMESH_Hypothesis_i*>( GetServant( myHyp ).in() );
if ( myImpl ) { if ( myImpl ) {
myImpl->LoadFrom( hypdata.c_str() ); myImpl->LoadFrom( hypdata.c_str() );
string iorString = GetORB()->object_to_string( myHyp ); CORBA::String_var iorString = GetORB()->object_to_string( myHyp );
int newId = myStudyContext->findId( iorString ); int newId = myStudyContext->findId( string( iorString.in() ) );
myStudyContext->mapOldToNew( id, newId ); myStudyContext->mapOldToNew( id, newId );
} }
else else
@ -2246,8 +2253,8 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent,
SMESH_Hypothesis_i* myImpl = dynamic_cast<SMESH_Hypothesis_i*>( GetServant( myHyp ).in() ); SMESH_Hypothesis_i* myImpl = dynamic_cast<SMESH_Hypothesis_i*>( GetServant( myHyp ).in() );
if ( myImpl ) { if ( myImpl ) {
myImpl->LoadFrom( hypdata.c_str() ); myImpl->LoadFrom( hypdata.c_str() );
string iorString = GetORB()->object_to_string( myHyp ); CORBA::String_var iorString = GetORB()->object_to_string( myHyp );
int newId = myStudyContext->findId( iorString ); int newId = myStudyContext->findId( string( iorString.in() ) );
myStudyContext->mapOldToNew( id, newId ); myStudyContext->mapOldToNew( id, newId );
} }
else else
@ -2286,8 +2293,8 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent,
SMESH_Mesh_i* myNewMeshImpl = dynamic_cast<SMESH_Mesh_i*>( GetServant( myNewMesh ).in() ); SMESH_Mesh_i* myNewMeshImpl = dynamic_cast<SMESH_Mesh_i*>( GetServant( myNewMesh ).in() );
if ( !myNewMeshImpl ) if ( !myNewMeshImpl )
continue; continue;
string iorString = GetORB()->object_to_string( myNewMesh ); CORBA::String_var iorString = GetORB()->object_to_string( myNewMesh );
int newId = myStudyContext->findId( iorString ); int newId = myStudyContext->findId( string( iorString.in() ) );
myStudyContext->mapOldToNew( id, newId ); myStudyContext->mapOldToNew( id, newId );
::SMESH_Mesh& myLocMesh = myNewMeshImpl->GetImpl(); ::SMESH_Mesh& myLocMesh = myNewMeshImpl->GetImpl();
@ -2472,8 +2479,8 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent,
( myNewMeshImpl->createSubMesh( aSubShapeObject ) ); ( myNewMeshImpl->createSubMesh( aSubShapeObject ) );
if ( aSubMesh->_is_nil() ) if ( aSubMesh->_is_nil() )
continue; continue;
string iorSubString = GetORB()->object_to_string( aSubMesh ); CORBA::String_var iorSubString = GetORB()->object_to_string( aSubMesh );
int newSubId = myStudyContext->findId( iorSubString ); int newSubId = myStudyContext->findId( string( iorSubString.in() ) );
myStudyContext->mapOldToNew( subid, newSubId ); myStudyContext->mapOldToNew( subid, newSubId );
} }
} }
@ -2770,8 +2777,8 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent,
if ( aNewGroup->_is_nil() ) if ( aNewGroup->_is_nil() )
continue; continue;
string iorSubString = GetORB()->object_to_string( aNewGroup ); CORBA::String_var iorSubString = GetORB()->object_to_string( aNewGroup );
int newSubId = myStudyContext->findId( iorSubString ); int newSubId = myStudyContext->findId( string( iorSubString.in() ) );
myStudyContext->mapOldToNew( subid, newSubId ); myStudyContext->mapOldToNew( subid, newSubId );
SMESH_GroupBase_i* aGroupImpl = SMESH_GroupBase_i* aGroupImpl =
@ -2925,8 +2932,8 @@ int SMESH_Gen_i::RegisterObject(CORBA::Object_ptr theObject)
{ {
StudyContext* myStudyContext = GetCurrentStudyContext(); StudyContext* myStudyContext = GetCurrentStudyContext();
if ( myStudyContext && !CORBA::is_nil( theObject )) { if ( myStudyContext && !CORBA::is_nil( theObject )) {
string iorString = GetORB()->object_to_string( theObject ); CORBA::String_var iorString = GetORB()->object_to_string( theObject );
return myStudyContext->addObject( iorString ); return myStudyContext->addObject( string( iorString.in() ) );
} }
return 0; return 0;
} }

9
src/SMESH_I/SMESH_Gen_i_1.cxx
View File

@ -180,7 +180,10 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::ObjectToSObject(SALOMEDS::Study_ptr theStudy,
{ {
SALOMEDS::SObject_var aSO; SALOMEDS::SObject_var aSO;
if ( !CORBA::is_nil( theStudy ) && !CORBA::is_nil( theObject )) if ( !CORBA::is_nil( theStudy ) && !CORBA::is_nil( theObject ))
aSO = theStudy->FindObjectIOR( SMESH_Gen_i::GetORB()->object_to_string( theObject ) ); {
CORBA::String_var objStr = SMESH_Gen_i::GetORB()->object_to_string( theObject );
aSO = theStudy->FindObjectIOR( objStr.in() );
}
return aSO._retn(); return aSO._retn();
} }
@ -253,8 +256,8 @@ static SALOMEDS::SObject_ptr publish(SALOMEDS::Study_ptr theStudy,
SALOMEDS::GenericAttribute_var anAttr; SALOMEDS::GenericAttribute_var anAttr;
if ( !CORBA::is_nil( theIOR )) { if ( !CORBA::is_nil( theIOR )) {
anAttr = aStudyBuilder->FindOrCreateAttribute( SO, "AttributeIOR" ); anAttr = aStudyBuilder->FindOrCreateAttribute( SO, "AttributeIOR" );
SALOMEDS::AttributeIOR::_narrow(anAttr)->SetValue CORBA::String_var objStr = SMESH_Gen_i::GetORB()->object_to_string( theIOR );
( SMESH_Gen_i::GetORB()->object_to_string( theIOR ) ); SALOMEDS::AttributeIOR::_narrow(anAttr)->SetValue( objStr.in() );
} }
if ( thePixMap ) { if ( thePixMap ) {
anAttr = aStudyBuilder->FindOrCreateAttribute( SO, "AttributePixMap" ); anAttr = aStudyBuilder->FindOrCreateAttribute( SO, "AttributePixMap" );

15
src/SMESH_I/SMESH_Hypothesis_i.cxx
View File

@ -46,25 +46,10 @@ SMESH_Hypothesis_i::SMESH_Hypothesis_i( PortableServer::POA_ptr thePOA )
{ {
MESSAGE( "SMESH_Hypothesis_i::SMESH_Hypothesis_i / Début" ); MESSAGE( "SMESH_Hypothesis_i::SMESH_Hypothesis_i / Début" );
myBaseImpl = 0; myBaseImpl = 0;
// _CS_gbo This instruction fails
// thePOA->activate_object( this );
// _CS_gbo I keep the POA reference to activate the object in the future.
myPOA = thePOA;
MESSAGE( "SMESH_Hypothesis_i::SMESH_Hypothesis_i / Fin" ); MESSAGE( "SMESH_Hypothesis_i::SMESH_Hypothesis_i / Fin" );
}; };
//=============================================================================
/*!
* SMESH_Hypothesis_i::Activate()
*
* Activation of the object
*/
//=============================================================================
void SMESH_Hypothesis_i::Activate() {
myPOA->activate_object( this );
}
//============================================================================= //=============================================================================
/*! /*!
* SMESH_Hypothesis_i::~SMESH_Hypothesis_i * SMESH_Hypothesis_i::~SMESH_Hypothesis_i

7
src/SMESH_I/SMESH_Hypothesis_i.hxx
View File

@ -69,19 +69,12 @@ public:
// Get implementation // Get implementation
::SMESH_Hypothesis* GetImpl(); ::SMESH_Hypothesis* GetImpl();
// _CS_gbo_ Activate the object using the POA
void Activate();
// Persistence // Persistence
virtual char* SaveTo(); virtual char* SaveTo();
virtual void LoadFrom( const char* theStream ); virtual void LoadFrom( const char* theStream );
protected: protected:
::SMESH_Hypothesis* myBaseImpl; // base hypothesis implementation ::SMESH_Hypothesis* myBaseImpl; // base hypothesis implementation
// _CS_gbo_070505 To keep the reference and delayed the activation
// in the methode Activate().
PortableServer::POA_ptr myPOA;
}; };
// ====================================================== // ======================================================

4
src/SMESH_I/SMESH_MEDMesh_i.cxx
View File

@ -863,8 +863,8 @@ void SMESH_MEDMesh_i::addInStudy(SALOMEDS::Study_ptr myStudy,
* ORB_INIT &init = *SINGLETON_<ORB_INIT>::Instance() ; * ORB_INIT &init = *SINGLETON_<ORB_INIT>::Instance() ;
* ASSERT(SINGLETON_<ORB_INIT>::IsAlreadyExisting()) ; * ASSERT(SINGLETON_<ORB_INIT>::IsAlreadyExisting()) ;
* CORBA::ORB_var &orb = init(0,0); * CORBA::ORB_var &orb = init(0,0);
* string iorStr = orb->object_to_string(myIor); * CORBA::String_var iorStr = orb->object_to_string(myIor);
* //myBuilder->AddAttribute(newObj,SALOMEDS::IOR,iorStr.c_str()); * //myBuilder->AddAttribute(newObj,SALOMEDS::IOR,iorStr.in());
* SALOMEDS::AttributeIOR_var aIOR = SALOMEDS::AttributeIOR::_narrow( * SALOMEDS::AttributeIOR_var aIOR = SALOMEDS::AttributeIOR::_narrow(
* myBuilder->FindOrCreateAttribute(newObj, "AttributeIOR")); * myBuilder->FindOrCreateAttribute(newObj, "AttributeIOR"));
* aIOR->SetValue(iorStr.c_str()); * aIOR->SetValue(iorStr.c_str());

1
src/SMESH_I/SMESH_Mesh_i.cxx
View File

@ -94,7 +94,6 @@ SMESH_Mesh_i::SMESH_Mesh_i( PortableServer::POA_ptr thePOA,
_gen_i = gen_i; _gen_i = gen_i;
_id = myIdGenerator++; _id = myIdGenerator++;
_studyId = studyId; _studyId = studyId;
thePOA->activate_object( this );
} }
//============================================================================= //=============================================================================

1
src/SMESH_I/SMESH_subMesh_i.cxx
View File

@ -70,7 +70,6 @@ SMESH_subMesh_i::SMESH_subMesh_i( PortableServer::POA_ptr thePOA,
_gen_i = gen_i; _gen_i = gen_i;
_mesh_i = mesh_i; _mesh_i = mesh_i;
_localId = localId; _localId = localId;
thePOA->activate_object( this );
// **** // ****
} }
//============================================================================= //=============================================================================