diff options
Diffstat (limited to 'TAO/examples/AMH/Sink_Server/Base_Server.cpp')
| -rw-r--r-- | TAO/examples/AMH/Sink_Server/Base_Server.cpp | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/TAO/examples/AMH/Sink_Server/Base_Server.cpp b/TAO/examples/AMH/Sink_Server/Base_Server.cpp index b1a722b18d8..a89205272b8 100644 --- a/TAO/examples/AMH/Sink_Server/Base_Server.cpp +++ b/TAO/examples/AMH/Sink_Server/Base_Server.cpp @@ -25,10 +25,8 @@ Base_Server::~Base_Server (void) ACE_TRY_NEW_ENV { this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->destroy (); } ACE_CATCHANY { @@ -113,12 +111,10 @@ Base_Server::start_orb_and_poa (void) this->orb_ = CORBA::ORB_init (this->argc_, this->argv_, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -127,14 +123,11 @@ Base_Server::start_orb_and_poa (void) this->root_poa_ = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->root_poa_->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); } ACE_CATCHANY @@ -156,13 +149,11 @@ Base_Server::register_servant (AMH_Servant *servant) ACE_TRY_NEW_ENV { Test::Roundtrip_var roundtrip = - servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant->_this (); CORBA::String_var ior = this->orb_->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; (void) this->write_ior_to_file (ior.in ()); } @@ -194,7 +185,6 @@ Base_Server::run_event_loop (void) // (some) replies to the client and the client just ends up // waiting (forever) for them. this->orb_->perform_work (period ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } } ACE_CATCHANY |