diff options
Diffstat (limited to 'TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp | 71 |
1 files changed, 24 insertions, 47 deletions
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp index 72014970c1d..95d0056e813 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp @@ -32,39 +32,30 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "---------------------------------------------\n")); ACE_DEBUG ((LM_DEBUG, "Running the IOGRManipulation Tests.\n")); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Retrieve the ORB. CORBA::ORB_var orb_ = CORBA::ORB_init (argc, argv, - 0 - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + 0); // ********************************************************************** // Get an object reference for the ORBs IORManipulation object! CORBA::Object_var IORM = orb_->resolve_initial_references (TAO_OBJID_IORMANIPULATION, - 0 - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + 0); TAO_IOP::TAO_IOR_Manipulation_var iorm = - TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in ()); // ********************************************************************** // Create a few fictitious IORs CORBA::Object_var name1 = orb_->string_to_object ("iiop://acme.cs.wustl.edu:6060/xyz" - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); CORBA::Object_var name2 = orb_->string_to_object ("iiop://tango.cs.wustl.edu:7070/xyz" - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); // ********************************************************************** // Create IOR list for use with merge_iors. @@ -75,8 +66,7 @@ main (int argc, char *argv[]) // ********************************************************************** CORBA::Object_var merged = - iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + iorm->merge_iors (iors); // Check for set and get primaries // Make a dummy property set @@ -84,8 +74,7 @@ main (int argc, char *argv[]) TAO_FT_IOGR_Property prop (ft_tag_component); CORBA::Boolean retval = - iorm->set_primary (&prop, name2.in (), merged.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + iorm->set_primary (&prop, name2.in (), merged.in ()); if (retval != 0) ACE_DEBUG ((LM_DEBUG, @@ -99,9 +88,7 @@ main (int argc, char *argv[]) // Check whether a primary has been set retval = iorm->is_primary_set (&prop, - merged.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + merged.in ()); if (retval) ACE_DEBUG ((LM_DEBUG, @@ -119,9 +106,7 @@ main (int argc, char *argv[]) // Get the primary CORBA::Object_var prim = iorm->get_primary (&prop, - merged.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + merged.in ()); // Check whether we got back the right primary if (prim->_is_equivalent (name2.in ())) @@ -159,9 +144,7 @@ main (int argc, char *argv[]) // Set the property retval = iorm->set_property (&prop, - merged.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + merged.in ()); /// Extract the property FT::TagFTGroupTaggedComponent ftc; @@ -169,10 +152,8 @@ main (int argc, char *argv[]) retval = tmp_prop.get_tagged_component (merged.in (), - ftc - ACE_ENV_ARG_PARAMETER); + ftc); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) Testing for tagged component \n")); @@ -190,37 +171,33 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\tWe have set the property\n"))); } - ACE_CATCH (TAO_IOP::NotFound, userex) + catch (const TAO_IOP::NotFound& userex) { - ACE_PRINT_EXCEPTION (userex, - ACE_TEXT ("Unexpected NotFound Exception!\n")); + userex._tao_print_exception ( + ACE_TEXT ( + "Unexpected NotFound Exception!\n")); return -1; } - ACE_CATCH (TAO_IOP::Duplicate, userex) + catch (const TAO_IOP::Duplicate& userex) { - ACE_PRINT_EXCEPTION (userex, - "Unexpected Duplicate Exception!\n"); + userex._tao_print_exception ("Unexpected Duplicate Exception!\n"); return -1; } - ACE_CATCH (TAO_IOP::Invalid_IOR, userex) + catch (const TAO_IOP::Invalid_IOR& userex) { - ACE_PRINT_EXCEPTION (userex, - "Unexpected Invalid_IOR Exception!\n"); + userex._tao_print_exception ("Unexpected Invalid_IOR Exception!\n"); return -1; } - ACE_CATCH (CORBA::SystemException, sysex) + catch (const CORBA::SystemException& sysex) { - ACE_PRINT_EXCEPTION (sysex, - "Unexpected system Exception!!\n"); + sysex._tao_print_exception ("Unexpected system Exception!!\n"); return -1; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Unexpected ACE_CATCHANY Exception!\n"); + ex._tao_print_exception ("Unexpected CORBA Exception!\n"); return -1; } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "IORManipulation Tests Successfully Completed!\n")); ACE_DEBUG ((LM_DEBUG, "---------------------------------------------\n")); |