Minimize delta

diff --git a/src/GEOM_I/GEOM_Gen_Session_i.cc b/src/GEOM_I/GEOM_Gen_Session_i.cc
index 21a8777f2c6a707eb22031262529f61c1bae23d2..6c8528309320065a16d9958cfc9c9d083f32debd 100644 (file)
--- a/src/GEOM_I/GEOM_Gen_Session_i.cc
+++ b/src/GEOM_I/GEOM_Gen_Session_i.cc
@@ -59,8 +59,6 @@ extern "C"
                                                const char*                   interfaceName)
   {
     GEOM_Gen_Session_i* myGEOM_Gen_i = new GEOM_Gen_Session_i(orb, poa, contId, instanceName, interfaceName);
-    auto id = poa->activate_object(myGEOM_Gen_i);
-    myGEOM_Gen_i->setId(id);
-    return id;
+    return myGEOM_Gen_i->getId();
   }
 }

diff --git a/src/GEOM_I/GEOM_Gen_i.cc b/src/GEOM_I/GEOM_Gen_i.cc
index c1367682796b12611462bb9c8672330b3b62ba00..4edd223037e48670b8eb82fd619f748fa05bb1da 100644 (file)
--- a/src/GEOM_I/GEOM_Gen_i.cc
+++ b/src/GEOM_I/GEOM_Gen_i.cc
@@ -103,7 +103,7 @@ GEOM_Gen_i::GEOM_Gen_i(CORBA::ORB_ptr            orb,
   Engines_Component_i(orb, poa, contId, instanceName, interfaceName, false, withRegistry)
 {
   _thisObj = this;
-
+  _id = _poa->activate_object(_thisObj);
   _impl = new ::GEOMImpl_Gen;
 
   //PAL10867: disable signals catching with "noexcepthandler" option

diff --git a/src/GEOM_SWIG/GeomHelper.cxx b/src/GEOM_SWIG/GeomHelper.cxx
index e0a82b38448e91bce42153c4df74d200c2ced40a..f4121d9b9ef281f151b14ce3c592c18da1233dee 100644 (file)
--- a/src/GEOM_SWIG/GeomHelper.cxx
+++ b/src/GEOM_SWIG/GeomHelper.cxx
@@ -45,8 +45,7 @@ std::string BuildGEOMInstance()
     pman->activate();
     //
     GEOM_Gen_No_Session_i *servant = new GEOM_Gen_No_Session_i(orb,poa,const_cast<PortableServer::ObjectId*>(&conId.in()),"GEOM_inst_2","GEOM");
-    PortableServer::ObjectId *zeId = poa->activate_object(servant);
-    servant->setId(zeId);
+    PortableServer::ObjectId *zeId = servant->getId();
     CORBA::Object_var zeRef = poa->id_to_reference(*zeId);
     char *interfaceName = servant->interfaceName();
     std::string interfaceNameCpp(interfaceName);