From e4229b899a29cfd773989216fae94f2cb206cd84 Mon Sep 17 00:00:00 2001 From: Paul RASCLE Date: Thu, 29 Mar 2018 16:31:10 +0200 Subject: [PATCH] reset CORBA default thread model for study POA --- src/SALOMEDS/SALOMEDS.cxx | 3 ++- src/SALOMEDS/SALOMEDS_Server.cxx | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) 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); -- 2.39.2