diff options
Diffstat (limited to 'TAO/tao/ORB_Core.cpp')
| -rw-r--r-- | TAO/tao/ORB_Core.cpp | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index f32effcf875..7530bde6ff3 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -2036,20 +2036,6 @@ TAO_ORB_Core::destroy (ACE_ENV_SINGLE_ARG_DECL) } void -TAO_ORB_Core::check_shutdown (ACE_ENV_SINGLE_ARG_DECL) -{ - if (this->has_shutdown ()) - { - // As defined by the CORBA 2.3 specification, throw a - // CORBA::BAD_INV_ORDER exception with minor code 4 if the ORB - // has shutdown by the time an ORB function is called. - - ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 4, - CORBA::COMPLETED_NO)); - } -} - -void TAO_ORB_Core::destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (()) { @@ -2784,6 +2770,17 @@ TAO_ORB_Core::add_interceptor ( } } +TAO_IORInterceptor_List * +TAO_ORB_Core::ior_interceptor_list (void) +{ + if (this->ior_interceptor_adapter ()) + { + return this->ior_interceptor_adapter_->interceptor_list (); + } + + return 0; +} + TAO_IORInterceptor_Adapter * TAO_ORB_Core::ior_interceptor_adapter (void) { @@ -2818,7 +2815,6 @@ TAO_ORB_Core::ior_interceptor_adapter (void) "ior_interceptor_adapter \n"); } ACE_ENDTRY; - ACE_CHECK_RETURN(0); } } @@ -2832,7 +2828,6 @@ TAO_ORB_Core_TSS_Resources::TAO_ORB_Core_TSS_Resources (void) , client_leader_thread_ (0) , lane_ (0) , ts_objects_ () - , upcalls_temporarily_suspended_on_this_thread_ (false) , orb_core_ (0) #if TAO_HAS_INTERCEPTORS == 1 , pi_current_ () |