diff options
Diffstat (limited to 'TAO/tao/PortableServer/Object_Adapter.cpp')
| -rw-r--r-- | TAO/tao/PortableServer/Object_Adapter.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp index a5bb502bd89..c76db656fc7 100644 --- a/TAO/tao/PortableServer/Object_Adapter.cpp +++ b/TAO/tao/PortableServer/Object_Adapter.cpp @@ -21,6 +21,7 @@ #include "tao/debug.h" #include "tao/PortableInterceptor.h" #include "tao/POA_Extension_Initializer.h" +#include "tao/Thread_Lane_Resources_Manager.h" #if !defined (__ACE_INLINE__) # include "Object_Adapter.i" @@ -587,12 +588,18 @@ TAO_Object_Adapter::open (CORBA::Environment &ACE_TRY_ENV) // takes a const reference and makes its own copy of the // policy. (Otherwise, we'd have to allocate the policy // on the heap.) - TAO_Implicit_Activation_Policy implicit_activation_policy ( - PortableServer::IMPLICIT_ACTIVATION); + TAO_Implicit_Activation_Policy + implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION); + policies.merge_policy (&implicit_activation_policy, ACE_TRY_ENV); #endif /* TAO_HAS_MINIMUM_POA == 0 */ + // This makes sure that the default resources are open when the Root + // POA is created. + this->orb_core_.thread_lane_resources_manager ().open_default_resources (ACE_TRY_ENV); + ACE_CHECK; + // Construct a new POA TAO_POA::String root_poa_name (TAO_DEFAULT_ROOTPOA_NAME); this->root_ = this->servant_dispatcher_->create_POA (root_poa_name, |