diff options
Diffstat (limited to 'CIAO/ciao/Servant_Impl_T.cpp')
| -rw-r--r-- | CIAO/ciao/Servant_Impl_T.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/CIAO/ciao/Servant_Impl_T.cpp b/CIAO/ciao/Servant_Impl_T.cpp index 8925ce3b213..81eb60789d6 100644 --- a/CIAO/ciao/Servant_Impl_T.cpp +++ b/CIAO/ciao/Servant_Impl_T.cpp @@ -62,11 +62,10 @@ namespace CIAO Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::same_component ( CORBA::Object_ptr object_ref ) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (::CORBA::is_nil (object_ref)) { - ACE_THROW_RETURN (::CORBA::BAD_PARAM (), 0); + throw ::CORBA::BAD_PARAM (); } ::CORBA::Object_var the_other = @@ -85,7 +84,6 @@ namespace CIAO ::Components::CCMHome_ptr Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::get_ccm_home ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->context_->get_CCM_home (); } @@ -96,7 +94,6 @@ namespace CIAO Components::SessionComponent_ptr Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::get_executor ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { ::Components::SessionComponent_var temp = ::Components::SessionComponent::_narrow ( @@ -111,7 +108,6 @@ namespace CIAO CORBA::Object_ptr Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::_get_component ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { ::Components::SessionContext_var sc = ::Components::SessionContext::_narrow ( @@ -133,8 +129,7 @@ namespace CIAO return ec->get_CCM_object (); } - ACE_THROW_RETURN (CORBA::INTERNAL (), - ::CORBA::Object::_nil ()); + throw CORBA::INTERNAL (); } // CIAO-specific operations. @@ -145,7 +140,6 @@ namespace CIAO void Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::activate_component ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->is_activated () == 0) { @@ -163,7 +157,6 @@ namespace CIAO void Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::ciao_preactivate ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { ::Components::SessionComponent_var temp = ::Components::SessionComponent::_narrow ( @@ -185,7 +178,6 @@ namespace CIAO typename CONTEXT> void Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::ciao_activate () - ACE_THROW_SPEC ((CORBA::SystemException)) { ::Components::SessionComponent_var temp = ::Components::SessionComponent::_narrow ( @@ -208,7 +200,6 @@ namespace CIAO void Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::ciao_postactivate ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { ::Components::SessionComponent_var temp = ::Components::SessionComponent::_narrow ( @@ -231,7 +222,6 @@ namespace CIAO CORBA::Boolean Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::is_activated ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->pre_activated_; } @@ -242,7 +232,6 @@ namespace CIAO void Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::ciao_passivate ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ Jai, could you please see why this is required? ::Components::SessionComponent_var temp = |