diff options
Diffstat (limited to 'TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp')
| -rw-r--r-- | TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp | 56 |
1 files changed, 12 insertions, 44 deletions
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp index 72c9ebc763b..5b34fa18129 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp +++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp @@ -24,17 +24,17 @@ public: void init_ORB (int argc, char *argv [] ACE_ENV_ARG_DECL); // Initializes the ORB. - void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL); + void resolve_naming_service (void); // Try to get hold of a running naming service. - void resolve_factory (ACE_ENV_SINGLE_ARG_DECL); + void resolve_factory (void); // Try to resolve the factory from the Naming service. CosEventChannelFactory::ChannelFactory_ptr - create_factory (ACE_ENV_SINGLE_ARG_DECL); + create_factory (void); // Create a local Factory and also set the <factory_>. - virtual void run_test (ACE_ENV_SINGLE_ARG_DECL); + virtual void run_test (void); // Runs a couple of tests to check if the factory behaves correctly. protected: @@ -94,16 +94,14 @@ FactoryClient::init_ORB (int argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -FactoryClient::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL) +FactoryClient::resolve_naming_service (void) { CORBA::Object_var naming_obj = this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Need to check return value for errors. if (CORBA::is_nil (naming_obj.in ())) @@ -111,13 +109,12 @@ FactoryClient::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL) this->naming_context_ = CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->use_naming_service = 1; } void -FactoryClient::resolve_factory (ACE_ENV_SINGLE_ARG_DECL) +FactoryClient::resolve_factory (void) { ACE_ASSERT (this->use_naming_service == 1); @@ -128,16 +125,14 @@ FactoryClient::resolve_factory (ACE_ENV_SINGLE_ARG_DECL) CORBA::Object_var obj = this->naming_context_->resolve (name ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->factory_ = CosEventChannelFactory::ChannelFactory::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } CosEventChannelFactory::ChannelFactory_ptr -FactoryClient::create_factory (ACE_ENV_SINGLE_ARG_DECL) +FactoryClient::create_factory (void) { ACE_THROW_RETURN (CORBA::UNKNOWN (), CosEventChannelFactory::ChannelFactory::_nil ()); @@ -159,7 +154,6 @@ FactoryClient::create_channel (const char *channel_id, ec = factory->create (channel_id, this->use_naming_service ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ASSERT (!CORBA::is_nil (ec.in ())); @@ -195,7 +189,6 @@ FactoryClient::destroy_channel (const char *channel_id this->factory_->destroy (channel_id, use_naming_service ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -211,13 +204,11 @@ FactoryClient::find_channel (const char* channel_id CosEventChannelAdmin::EventChannel_var channel = this->factory_->find (channel_id ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::String_var str = orb_->object_to_string (channel.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Find returned - %s \n", @@ -225,7 +216,6 @@ FactoryClient::find_channel (const char* channel_id this->find_channel_id (channel.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::UserException, ue) { @@ -247,7 +237,6 @@ FactoryClient::find_channel_id (CosEventChannelAdmin::EventChannel_ptr channel CORBA::String_var str = orb_->object_to_string (channel ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "trying to find the Channel %s \n", @@ -256,7 +245,6 @@ FactoryClient::find_channel_id (CosEventChannelAdmin::EventChannel_ptr channel char *channel_id = this->factory_->find_channel_id (channel ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "find returned %s\n", channel_id)); @@ -267,7 +255,7 @@ FactoryClient::find_channel_id (CosEventChannelAdmin::EventChannel_ptr channel */ void -FactoryClient::run_test (ACE_ENV_SINGLE_ARG_DECL) +FactoryClient::run_test (void) { ACE_ASSERT (!CORBA::is_nil (this->factory_.in ())); @@ -278,85 +266,68 @@ FactoryClient::run_test (ACE_ENV_SINGLE_ARG_DECL) cosec[0] = this->create_channel (channel_id[0], this->factory_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // create the second cosec cosec[1] = this->create_channel (channel_id[1], this->factory_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // create the third cosec cosec[2] = this->create_channel (channel_id[2], this->factory_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // see it we can destroy this one.. this->destroy_channel (channel_id[2] ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // see if we can find it? this->find_channel_id (cosec[2].in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // see if we can create it again? cosec[2] = this->create_channel (channel_id[2], this->factory_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // try and find a channel that does not exist. this->find_channel ("areyouthere?" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // see if it can detect duplicates. this->create_channel (channel_id[2], this->factory_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // see if it can give us the id? this->find_channel_id (cosec[0].in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->find_channel_id (cosec[1].in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->find_channel_id (cosec[2].in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // check if we can get the channels from the id. this->find_channel (channel_id[0] ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->find_channel (channel_id[1] ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->find_channel (channel_id[2] ACE_ENV_ARG_PARAMETER); - ACE_CHECK; //destroy them all. this->destroy_channel (channel_id[0] ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->destroy_channel (channel_id[1] ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->destroy_channel (channel_id[2] ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // end of testing. ACE_DEBUG ((LM_DEBUG, @@ -375,14 +346,13 @@ main (int argc, char *argv []) ft.init_ORB (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_TRY_EX (naming) { - ft.resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER); + ft.resolve_naming_service (); ACE_TRY_CHECK_EX (naming); - ft.resolve_factory (ACE_ENV_SINGLE_ARG_PARAMETER); + ft.resolve_factory (); ACE_TRY_CHECK_EX (naming); } ACE_CATCHANY @@ -392,13 +362,11 @@ main (int argc, char *argv []) ACE_DEBUG ((LM_DEBUG, "Creating a local Factory\n")); // TBD: - ft.create_factory (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ft.create_factory (); } ACE_ENDTRY; - ft.run_test (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ft.run_test (); } ACE_CATCH (CORBA::UserException, ue) { |