diff options
Diffstat (limited to 'TAO/examples/Quoter/Generic_Factory_i.cpp')
| -rw-r--r-- | TAO/examples/Quoter/Generic_Factory_i.cpp | 54 |
1 files changed, 18 insertions, 36 deletions
diff --git a/TAO/examples/Quoter/Generic_Factory_i.cpp b/TAO/examples/Quoter/Generic_Factory_i.cpp index 15c9a4034c5..b8b31a9f546 100644 --- a/TAO/examples/Quoter/Generic_Factory_i.cpp +++ b/TAO/examples/Quoter/Generic_Factory_i.cpp @@ -20,8 +20,8 @@ #include "ace/Get_Opt.h" -ACE_RCSID (Quoter, - Generic_Factory_i, +ACE_RCSID (Quoter, + Generic_Factory_i, "$Id$") // Constructor @@ -36,8 +36,7 @@ Quoter_Generic_Factory_i::~Quoter_Generic_Factory_i (void) } CORBA::Boolean -Quoter_Generic_Factory_i::supports (const CosLifeCycle::Key & - ACE_ENV_ARG_DECL_NOT_USED) +Quoter_Generic_Factory_i::supports (const CosLifeCycle::Key &) ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; @@ -46,11 +45,10 @@ Quoter_Generic_Factory_i::supports (const CosLifeCycle::Key & CosNaming::NamingContext_ptr -Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_key - ACE_ENV_ARG_DECL) +Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_key) { CosNaming::NamingContext_var quoterNamingContext_var; - ACE_TRY + try { // @@ FIXME Get a reference to the ORB. CORBA::ORB_ptr orb_ptr = @@ -58,8 +56,7 @@ Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_k // Get the Naming Service object reference. CORBA::Object_var namingObj_var = - orb_ptr->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + orb_ptr->resolve_initial_references ("NameService"); if (CORBA::is_nil (namingObj_var.in ())) ACE_ERROR ((LM_ERROR, @@ -67,9 +64,7 @@ Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_k // Narrow the object reference to a Naming Context. CosNaming::NamingContext_var namingContext_var = - CosNaming::NamingContext::_narrow (namingObj_var.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + CosNaming::NamingContext::_narrow (namingObj_var.in ()); CosNaming::Name quoterContextName (1); // max = 1 quoterContextName.length (1); @@ -77,20 +72,16 @@ Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_k // Get the IDL_Quoter naming context. CORBA::Object_var quoterNamingObj_var = - namingContext_var->resolve (quoterContextName ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + namingContext_var->resolve (quoterContextName); quoterNamingContext_var = - CosNaming::NamingContext::_narrow (quoterNamingObj_var.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + CosNaming::NamingContext::_narrow (quoterNamingObj_var.in ()); } - ACE_CATCHANY + catch (const CORBA::Exception&) { ACE_THROW_RETURN (CosLifeCycle::NoFactory (factory_key), CosNaming::NamingContext::_nil ()); } - ACE_ENDTRY; return quoterNamingContext_var._retn (); } @@ -98,20 +89,17 @@ 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_ENV_ARG_DECL) + const CosLifeCycle::Criteria &) ACE_THROW_SPEC ((CORBA::SystemException, CosLifeCycle::NoFactory, CosLifeCycle::InvalidCriteria, CosLifeCycle::CannotMeetCriteria)) { Stock::Quoter_var quoter_var; - ACE_TRY + try { CosNaming::NamingContext_var quoterNamingContext_var = - this->get_naming_context (factory_key - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + this->get_naming_context (factory_key); // ** now a proper reference to the quoter naming context is // available @@ -122,20 +110,17 @@ Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key, // Try to get a reference to a Quoter Factory CORBA::Object_var quoterFactoryObject_var = - quoterNamingContext_var->resolve (factory_Name ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + quoterNamingContext_var->resolve (factory_Name); // We were able to get a reference to Quoter Factory. // Check if it is a valid Quoter Factory reference if (CORBA::is_nil (quoterFactoryObject_var.in())) { // throw a NoFactory exception - ACE_TRY_THROW (CosLifeCycle::NoFactory (factory_key)); + throw CosLifeCycle::NoFactory (factory_key); } Stock::Quoter_Factory_var factory_var = - Stock::Quoter_Factory::_narrow (quoterFactoryObject_var.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + Stock::Quoter_Factory::_narrow (quoterFactoryObject_var.in ()); if (CORBA::is_nil (factory_var.in ())) { @@ -149,9 +134,7 @@ Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key, // Now retrieve the Quoter obj ref corresponding to the key. quoter_var = - factory_var->create_quoter ("test" - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + factory_var->create_quoter ("test"); if (this->debug_level_ > 1) ACE_DEBUG ((LM_DEBUG, "Generic_Factory: Quoter Created\n")); @@ -167,11 +150,10 @@ Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key, ACE_DEBUG ((LM_DEBUG, "Generic_Factory: Return an object reference to a new object.\n")); } - ACE_CATCHANY + catch (const CORBA::Exception&) { ACE_THROW_RETURN (CosLifeCycle::NoFactory (factory_key), CORBA::Object::_nil ()); } - ACE_ENDTRY; return quoter_var._retn (); } |