1 files changed, 4 insertions, 23 deletions

diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
index 92ffd886c0f..46c5be55077 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
@@ -71,7 +71,6 @@ Airplane_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
     {
       // Initialize the ORB
       this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Save pointers to the command line arguments
       this->argc_ = argc;
@@ -87,16 +86,13 @@ Airplane_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
       CORBA::Object_var obj =
         this->orb_->resolve_initial_references ("RootPOA"
                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       ACE_ASSERT(! CORBA::is_nil (obj.in ()));
 
       // Narrow the object to a POA.
       root_poa_ = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Get the POA_Manager.
-      this->poa_manager_ = this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->poa_manager_ = this->root_poa_->the_POAManager ();
 
       // We now need to create a POA with the persistent and user_id policies,
       // since they are need for use with the Implementation Repository.
@@ -112,21 +108,18 @@ Airplane_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
       policies[1] =
         this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT
                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       this->airplane_poa_ =
         this->root_poa_->create_POA (poa_name,
                               this->poa_manager_.in (),
                               policies
                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Creation of the new POA is over, so destroy the Policy_ptr's.
       for (CORBA::ULong i = 0; i < policies.length (); ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policy->destroy ();
         }
 
       ACE_NEW_RETURN (this->server_impl_, Airplane_i, -1);
@@ -137,22 +130,17 @@ Airplane_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
       this->airplane_poa_->activate_object_with_id (server_id.in (),
                                                     this->server_impl_
                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       obj = this->airplane_poa_->id_to_reference (server_id.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       CORBA::String_var ior =
         this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG, "The ImRified IOR is: <%s>\n", ior.in ()));
 
       TAO_Root_POA* tmp_poa = dynamic_cast<TAO_Root_POA*>(airplane_poa_.in());
       obj = tmp_poa->id_to_reference_i (server_id.in (), false ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       CORBA::String_var plain_ior =
         this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG, "The plain IOR is: <%s>\n", plain_ior.in ()));
 
@@ -160,17 +148,13 @@ Airplane_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
       // invoke indirectly using a simple object_key reference
       // like "corbaloc::localhost:8888/airplane_server".
       obj = this->orb_->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       IORTable::Table_var adapter =
         IORTable::Table::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       ACE_ASSERT(! CORBA::is_nil (adapter.in ()));
       adapter->bind (poa_name, plain_ior.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
-      this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->poa_manager_->activate ();
 
       if (this->ior_output_file_)
         {
@@ -185,13 +169,12 @@ Airplane_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
     }
   ACE_ENDTRY;
 
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
 
 int
-Airplane_Server_i::run (ACE_ENV_SINGLE_ARG_DECL)
+Airplane_Server_i::run (void)
 {
   ACE_TRY
     {
@@ -199,7 +182,6 @@ Airplane_Server_i::run (ACE_ENV_SINGLE_ARG_DECL)
       ACE_Time_Value tvStart = ACE_OS::gettimeofday();
 
       this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       ACE_Time_Value tvEnd = ACE_OS::gettimeofday();
 
@@ -216,7 +198,6 @@ Airplane_Server_i::run (ACE_ENV_SINGLE_ARG_DECL)
     }
   ACE_ENDTRY;
 
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }