Merge V9_dev branch into master

[modules/kernel.git] / src / SALOMEDS / SALOMEDS.cxx

diff --git a/src/SALOMEDS/SALOMEDS.cxx b/src/SALOMEDS/SALOMEDS.cxx
index 2d86b26de6f34157141879e41fcbb2e5891d8db9..b6fdf918b64c9ace47c92c61d044749ab10a8fd9 100644 (file)
--- a/src/SALOMEDS/SALOMEDS.cxx
+++ b/src/SALOMEDS/SALOMEDS.cxx
@@ -38,6 +38,8 @@
 
 #include "SALOMEDS_Defines.hxx"
 
+#include <utilities.h>
+
 // IDL headers
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOMEDS)
@@ -110,6 +112,19 @@ extern "C"
     CORBA::Object_var obj = namingService.Resolve( "/Study" );
     SALOMEDS::Study_var aStudy = SALOMEDS::Study::_narrow( obj );
     if( CORBA::is_nil(aStudy) ) {
+      PortableServer::POAManager_var pman = root_poa->the_POAManager();
+      CORBA::PolicyList policies;
+      policies.length(2);
+      //PortableServer::ThreadPolicy_var threadPol(root_poa->create_thread_policy(PortableServer::SINGLE_THREAD_MODEL));
+      PortableServer::ThreadPolicy_var threadPol(root_poa->create_thread_policy(PortableServer::ORB_CTRL_MODEL));
+      PortableServer::ImplicitActivationPolicy_var implicitPol(root_poa->create_implicit_activation_policy(PortableServer::IMPLICIT_ACTIVATION));
+      policies[0] = PortableServer::ThreadPolicy::_duplicate(threadPol);
+      policies[1] = PortableServer::ImplicitActivationPolicy::_duplicate(implicitPol);
+      PortableServer::POA_var poa = root_poa->create_POA("KERNELStudySingleThreadPOA",pman,policies);
+      MESSAGE("CreateStudy: KERNELStudySingleThreadPOA: "<< poa);
+      threadPol->destroy();
+
+      SALOMEDS_Study_i::SetThePOA(poa);  
       SALOMEDS_Study_i* aStudy_i = new SALOMEDS_Study_i(orb);
 
       // Activate the objects.  This tells the POA that the objects are ready to accept requests.