diff options
Diffstat (limited to 'TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp | 83 |
1 files changed, 31 insertions, 52 deletions
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp index 87fc72368e8..2edb37fe9f7 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp @@ -62,16 +62,14 @@ int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; Manager manager; - ACE_TRY + try { // Initilaize the ORB, POA etc. manager.init (argc, - argv - ACE_ENV_ARG_PARAMETER); + argv); // the command line arguments if (parse_args (argc, argv) == -1) @@ -92,13 +90,11 @@ main (int argc, Client_i client_imp (manager.orb ()); client_imp.init (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught"); + ex._tao_print_exception ("Caught"); return -1; } - ACE_ENDTRY; return 0; } @@ -112,22 +108,19 @@ Manager::Manager (void) void Manager::init (int argc, - char *argv[] - ACE_ENV_ARG_DECL) + char *argv[]) { this->orb_ = CORBA::ORB_init (argc, argv, - 0 - ACE_ENV_ARG_PARAMETER); + 0); // Obtain the RootPOA. CORBA::Object_var obj_var = - this->orb_->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RootPOA"); // Get the POA_var object from Object_var. PortableServer::POA_var root_poa_var = - PortableServer::POA::_narrow (obj_var.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj_var.in ()); // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager_var = @@ -141,22 +134,19 @@ Manager::make_merged_iors (void) { // First server object_primary = - this->orb_->string_to_object (first_ior - ACE_ENV_ARG_PARAMETER); + this->orb_->string_to_object (first_ior); //Second server object_secondary = - this->orb_->string_to_object (second_ior - ACE_ENV_ARG_PARAMETER); + this->orb_->string_to_object (second_ior); // Get an object reference for the ORBs IORManipultion object! CORBA::Object_var IORM = this->orb_->resolve_initial_references (TAO_OBJID_IORMANIPULATION, - 0 - ACE_ENV_ARG_PARAMETER); + 0); iorm = - TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in() ACE_ENV_ARG_PARAMETER); + TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in()); // Create the list @@ -167,7 +157,7 @@ Manager::make_merged_iors (void) // Create a merged set 1; merged_set_ = - iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER); + iorm->merge_iors (iors); return 0; } @@ -200,8 +190,7 @@ Manager::set_properties (void) // Set the property CORBA::Boolean retval = iorm->set_property (&iogr_prop, - this->merged_set_.in () - ACE_ENV_ARG_PARAMETER); + this->merged_set_.in ()); // Set the primary // See we are setting the second ior as the primary @@ -209,8 +198,7 @@ Manager::set_properties (void) { retval = iorm->set_primary (&iogr_prop, object_secondary.in (), - this->merged_set_.in () - ACE_ENV_ARG_PARAMETER); + this->merged_set_.in ()); } return 0; @@ -219,17 +207,16 @@ Manager::set_properties (void) int Manager::run (void) { - ACE_TRY + try { this->orb_->run (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { ACE_ERROR_RETURN ((LM_DEBUG, "Error in run \n"), -1); } - ACE_ENDTRY; return 0; } @@ -268,8 +255,7 @@ Client_i::Client_i (CORBA::ORB_ptr orb) } void -run_test (Simple_Server_ptr server - ACE_ENV_ARG_DECL); +run_test (Simple_Server_ptr server); void Client_i::init (void) @@ -296,17 +282,14 @@ Client_i::init (void) char **argv = 0; this->orb_ = CORBA::ORB_init (argc, argv, - 0 - ACE_ENV_ARG_PARAMETER); + 0); CORBA::Object_var object = - this->orb_->string_to_object (data - ACE_ENV_ARG_PARAMETER); + this->orb_->string_to_object (data); // Combined IOR stuff Simple_Server_var server = - Simple_Server::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + Simple_Server::_narrow (object.in ()); if (CORBA::is_nil (server.in ())) { @@ -315,23 +298,21 @@ Client_i::init (void) data)); } - run_test (server.in () - ACE_ENV_ARG_PARAMETER); + run_test (server.in ()); ior_buffer.alloc ()->free (data); ACE_OS::close (f_handle); } -void run_test (Simple_Server_ptr server - ACE_ENV_ARG_DECL) +void run_test (Simple_Server_ptr server) { // We do this twice as we know that there are only two servers. for (CORBA::ULong i = 0; i < 2; i++) { - ACE_TRY + try { for (CORBA::ULong j = 0; j < 10; @@ -348,11 +329,11 @@ void run_test (Simple_Server_ptr server server->shutdown (); ACE_OS::sleep (2); } - ACE_CATCH (CORBA::TRANSIENT, t) + catch (const CORBA::TRANSIENT& t) { if (t.completed () != CORBA::COMPLETED_NO) { - ACE_PRINT_EXCEPTION (t, "Unexpected kind of TRANSIENT"); + t._tao_print_exception ("Unexpected kind of TRANSIENT"); } else { @@ -363,18 +344,16 @@ void run_test (Simple_Server_ptr server ACE_OS::sleep (1); } } - ACE_CATCH (CORBA::COMM_FAILURE, f) + catch (const CORBA::COMM_FAILURE& f) { - ACE_PRINT_EXCEPTION (f, "A (sort of) expected COMM_FAILURE"); + f._tao_print_exception ("A (sort of) expected COMM_FAILURE"); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Automagically re-issuing request on COMM_FAILURE\n"))); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Unexpected exception"); - ACE_RE_THROW; + ex._tao_print_exception ("Unexpected exception"); + throw; } - ACE_ENDTRY; } } |