diff options
Diffstat (limited to 'TAO/examples/Quoter/Generic_Factory_i.cpp')
| -rw-r--r-- | TAO/examples/Quoter/Generic_Factory_i.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/TAO/examples/Quoter/Generic_Factory_i.cpp b/TAO/examples/Quoter/Generic_Factory_i.cpp index b8b31a9f546..74eb8e88b8f 100644 --- a/TAO/examples/Quoter/Generic_Factory_i.cpp +++ b/TAO/examples/Quoter/Generic_Factory_i.cpp @@ -37,7 +37,6 @@ Quoter_Generic_Factory_i::~Quoter_Generic_Factory_i (void) CORBA::Boolean Quoter_Generic_Factory_i::supports (const CosLifeCycle::Key &) - ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; } @@ -79,8 +78,7 @@ Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_k } catch (const CORBA::Exception&) { - ACE_THROW_RETURN (CosLifeCycle::NoFactory (factory_key), - CosNaming::NamingContext::_nil ()); + throw CosLifeCycle::NoFactory (factory_key); } return quoterNamingContext_var._retn (); } @@ -90,10 +88,6 @@ Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_k CORBA::Object_ptr Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key, const CosLifeCycle::Criteria &) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLifeCycle::NoFactory, - CosLifeCycle::InvalidCriteria, - CosLifeCycle::CannotMeetCriteria)) { Stock::Quoter_var quoter_var; try @@ -152,8 +146,7 @@ Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key, } catch (const CORBA::Exception&) { - ACE_THROW_RETURN (CosLifeCycle::NoFactory (factory_key), - CORBA::Object::_nil ()); + throw CosLifeCycle::NoFactory (factory_key); } return quoter_var._retn (); } |