diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp | 34 |
1 files changed, 6 insertions, 28 deletions
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp index c83f99101e1..98fb0329c25 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp @@ -24,8 +24,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::Boolean TAO_FT_IOGR_Property::set_property ( CORBA::Object_ptr &ior) - ACE_THROW_SPEC ((CORBA::SystemException, - TAO_IOP::Invalid_IOR)) { // We need to apply the property for every profile in the IOR @@ -77,9 +75,6 @@ TAO_FT_IOGR_Property::set_property ( CORBA::Boolean TAO_FT_IOGR_Property::is_primary_set ( CORBA::Object_ptr ior) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (this->get_primary_profile (ior) != 0) return 1; @@ -91,18 +86,13 @@ TAO_FT_IOGR_Property::is_primary_set ( CORBA::Object_ptr TAO_FT_IOGR_Property::get_primary ( CORBA::Object_ptr ior) - ACE_THROW_SPEC (( - CORBA::SystemException, - TAO_IOP::NotFound - )) { TAO_Profile *pfile = this->get_primary_profile (ior); if (pfile == 0) - ACE_THROW_RETURN (TAO_IOP::NotFound (), - CORBA::Object::_nil ()); + throw TAO_IOP::NotFound (); // Search for the IOP::TAG_FT_PRIMARY in the tagged component of // the profile @@ -145,8 +135,7 @@ TAO_FT_IOGR_Property::get_primary ( // Clean up in case of errors. if (CORBA::is_nil (new_obj.in ())) { - ACE_THROW_RETURN (TAO_IOP::NotFound (), // ** Changed from Invalid_IOR () ** - CORBA::Object::_nil ()); + throw TAO_IOP::NotFound (); } // Release ownership of the pointers protected by the auto_ptrs since they @@ -162,11 +151,6 @@ CORBA::Boolean TAO_FT_IOGR_Property::set_primary ( CORBA::Object_ptr &ior1, CORBA::Object_ptr ior2) - ACE_THROW_SPEC (( - CORBA::SystemException, - TAO_IOP::NotFound, - TAO_IOP::Duplicate - )) { // Check for primary in <ior2> IOP::TaggedComponent tagged_components; @@ -183,8 +167,7 @@ TAO_FT_IOGR_Property::set_primary ( mprofile.get_profile (i)->tagged_components (); if (tag_comp.get_component (tagged_components) == 1) - ACE_THROW_RETURN (TAO_IOP::Duplicate (), - 0); + throw TAO_IOP::Duplicate (); } // Check whether ior1 exists in ior2 @@ -217,8 +200,7 @@ TAO_FT_IOGR_Property::set_primary ( // At the end of the loop check whether we have seen <ior1> in // <ior2> if (index == -1) - ACE_THROW_RETURN (TAO_IOP::NotFound (), - 0); + throw TAO_IOP::NotFound (); CORBA::Boolean val = 1; @@ -342,7 +324,6 @@ CORBA::Boolean TAO_FT_IOGR_Property::get_tagged_component ( const CORBA::Object_ptr iogr, FT::TagFTGroupTaggedComponent &fgtc) const - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Stub *stub = iogr->_stubobj (); @@ -375,16 +356,14 @@ TAO_FT_IOGR_Property::get_tagged_component ( CORBA::Boolean byte_order; if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0) - ACE_THROW_RETURN (CORBA::MARSHAL (), - 0); + throw CORBA::MARSHAL (); cdr.reset_byte_order (static_cast<int> (byte_order)); if ((cdr >> fgtc) == 1) return 1; else - ACE_THROW_RETURN (CORBA::MARSHAL (), - 0); + throw CORBA::MARSHAL (); } } @@ -394,7 +373,6 @@ TAO_FT_IOGR_Property::get_tagged_component ( CORBA::Boolean TAO_FT_IOGR_Property::remove_primary_tag ( CORBA::Object_ptr &iogr) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Get the MProfile TAO_MProfile &mprofile = |