diff options
Diffstat (limited to 'TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp')
| -rw-r--r-- | TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp | 47 |
1 files changed, 10 insertions, 37 deletions
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp index 9ec72d46d84..6bcd6c8d280 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp @@ -71,11 +71,6 @@ TAO_CosEventChannelFactory_i::init (PortableServer::POA_ptr poa, CosEventChannelAdmin::EventChannel_ptr TAO_CosEventChannelFactory_i::create (const char * channel_id, CORBA::Boolean store_in_naming_service) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventChannelFactory::DuplicateChannel, - CosEventChannelFactory::BindFailed - )) { ACE_ASSERT (!CORBA::is_nil (this->poa_.in ())); @@ -124,43 +119,35 @@ TAO_CosEventChannelFactory_i::create (const char * channel_id, } catch (const PortableServer::POA::ServantAlreadyActive&) { - ACE_THROW_RETURN (CosEventChannelFactory::DuplicateChannel (), - ec_return._retn ()); + throw CosEventChannelFactory::DuplicateChannel (); } catch (const PortableServer::POA::ObjectAlreadyActive&) { - ACE_THROW_RETURN (CosEventChannelFactory::DuplicateChannel (), - ec_return._retn ()); + throw CosEventChannelFactory::DuplicateChannel (); } catch (const PortableServer::POA::WrongPolicy&) { - ACE_THROW_RETURN (CORBA::UNKNOWN (), - ec_return._retn ()); + throw CORBA::UNKNOWN (); } catch (const PortableServer::POA::ObjectNotActive&) { - ACE_THROW_RETURN (CosEventChannelFactory::BindFailed (), - ec_return._retn ()); + throw CosEventChannelFactory::BindFailed (); } catch (const CosNaming::NamingContext::NotFound&) { - ACE_THROW_RETURN (CosEventChannelFactory::BindFailed (), - ec_return._retn ()); + throw CosEventChannelFactory::BindFailed (); } catch (const CosNaming::NamingContext::CannotProceed&) { - ACE_THROW_RETURN (CosEventChannelFactory::BindFailed (), - ec_return._retn ()); + throw CosEventChannelFactory::BindFailed (); } catch (const CosNaming::NamingContext::InvalidName&) { - ACE_THROW_RETURN (CosEventChannelFactory::BindFailed (), - ec_return._retn ()); + throw CosEventChannelFactory::BindFailed (); } catch (const CosNaming::NamingContext::AlreadyBound&) { - ACE_THROW_RETURN (CosEventChannelFactory::BindFailed (), - ec_return._retn ()); + throw CosEventChannelFactory::BindFailed (); } return ec_return._retn (); @@ -172,10 +159,6 @@ TAO_CosEventChannelFactory_i::destroy const char * channel_id, CORBA::Boolean unbind_from_naming_service ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventChannelFactory::NoSuchChannel - )) { ACE_ASSERT (!CORBA::is_nil (this->poa_.in ())); @@ -227,10 +210,6 @@ TAO_CosEventChannelFactory_i::find ( const char * channel_id ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventChannelFactory::NoSuchChannel - )) { ACE_ASSERT (!CORBA::is_nil (this->poa_.in ())); @@ -248,8 +227,7 @@ TAO_CosEventChannelFactory_i::find } catch (const CORBA::UserException&)// Translate any user exception. { - ACE_THROW_RETURN (CosEventChannelFactory::NoSuchChannel (), - ec_return._retn ()); + throw CosEventChannelFactory::NoSuchChannel (); } return ec_return._retn (); @@ -260,10 +238,6 @@ TAO_CosEventChannelFactory_i::find_channel_id ( CosEventChannelAdmin::EventChannel_ptr channel ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventChannelFactory::NoSuchChannel - )) { ACE_ASSERT (!CORBA::is_nil (this->poa_.in ())); @@ -277,8 +251,7 @@ TAO_CosEventChannelFactory_i::find_channel_id } catch (const CORBA::UserException&)// Translate any user exception. { - ACE_THROW_RETURN (CosEventChannelFactory::NoSuchChannel (), - str_return._retn ()); + throw CosEventChannelFactory::NoSuchChannel (); } return str_return._retn (); |