diff options
Diffstat (limited to 'TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp index 1f9be0a55a1..287e479a1c1 100644 --- a/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp @@ -46,7 +46,6 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; @@ -54,11 +53,9 @@ main (int argc, char *argv[]) // First perform the test with an IOR CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Hello_var hello = Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (hello.in ())) { @@ -69,10 +66,9 @@ main (int argc, char *argv[]) } // Check this isn't generating exceptions for any other reason - hello->ping (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->ping (); - if (hello->has_ft_request_service_context (ACE_ENV_SINGLE_ARG_PARAMETER)) + if (hello->has_ft_request_service_context ()) { ACE_DEBUG ((LM_ERROR, "ERROR - REGRESSION - Request made on a plain IOR has a FT_REQUEST service context.\n" )); result = 1; @@ -85,11 +81,9 @@ main (int argc, char *argv[]) // Now repeat the test (for the converse result) with an IOGR tmp = orb->string_to_object(iogr ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; hello = Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (hello.in ())) { @@ -100,10 +94,9 @@ main (int argc, char *argv[]) } // Check this isn't generating transients for any other reason - hello->ping (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->ping (); - if (! hello->has_ft_request_service_context (ACE_ENV_SINGLE_ARG_PARAMETER)) + if (! hello->has_ft_request_service_context ()) { ACE_DEBUG ((LM_ERROR, "ERROR - REGRESSION - Request made on an IOGR has no FT_REQUEST service context.\n" )); result = 1; @@ -113,11 +106,9 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Request made on an IOGR has a FT_REQUEST service context. This is OK.\n" )); } - hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->shutdown (); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { |