From: Paul RASCLE <paul.rascle@edf.fr>
Date: Thu, 29 Mar 2018 14:31:10 +0000 (+0200)
Subject: reset CORBA default thread model for study POA
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fpre%2FYacsParallelMesh83;p=modules%2Fkernel.git

reset CORBA default thread model for study POA
---

diff --git a/src/SALOMEDS/SALOMEDS.cxx b/src/SALOMEDS/SALOMEDS.cxx
index 06dda3211..e6313314b 100644
--- a/src/SALOMEDS/SALOMEDS.cxx
+++ b/src/SALOMEDS/SALOMEDS.cxx
@@ -123,7 +123,8 @@ SALOMEDS_EXPORT
     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::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);
diff --git a/src/SALOMEDS/SALOMEDS_Server.cxx b/src/SALOMEDS/SALOMEDS_Server.cxx
index a780abd6c..26cce9bb7 100644
--- a/src/SALOMEDS/SALOMEDS_Server.cxx
+++ b/src/SALOMEDS/SALOMEDS_Server.cxx
@@ -103,8 +103,9 @@ int main(int argc, char** argv)
               PortableServer::POAManager_var pman = defaultPoa->the_POAManager();
               CORBA::PolicyList policies;
               policies.length(2);
-              PortableServer::ThreadPolicy_var threadPol(defaultPoa->create_thread_policy(PortableServer::SINGLE_THREAD_MODEL));
-              PortableServer::ImplicitActivationPolicy_var implicitPol(defaultPoa->create_implicit_activation_policy(PortableServer::IMPLICIT_ACTIVATION));
+              //PortableServer::ThreadPolicy_var threadPol(defaultPoa->create_thread_policy(PortableServer::SINGLE_THREAD_MODEL));
+              PortableServer::ThreadPolicy_var threadPol(defaultPoa->create_thread_policy(PortableServer::ORB_CTRL_MODEL)); // default for all POAs
+              PortableServer::ImplicitActivationPolicy_var implicitPol(defaultPoa->create_implicit_activation_policy(PortableServer::IMPLICIT_ACTIVATION)); // default for Root_POA, NO for others
               policies[0] = PortableServer::ThreadPolicy::_duplicate(threadPol);
               policies[1] = PortableServer::ImplicitActivationPolicy::_duplicate(implicitPol);
               poa = defaultPoa->create_POA("KERNELStandaloneStudySingleThreadPOA",pman,policies);