diff options
Diffstat (limited to 'TAO/tests/IPV6/client.cpp')
-rw-r--r-- | TAO/tests/IPV6/client.cpp | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/TAO/tests/IPV6/client.cpp b/TAO/tests/IPV6/client.cpp index 77a6ec4190b..436ff516b0b 100644 --- a/TAO/tests/IPV6/client.cpp +++ b/TAO/tests/IPV6/client.cpp @@ -43,22 +43,19 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->string_to_object(ior); Test::Hello_var hello = - Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + Test::Hello::_narrow(tmp.in ()); if (CORBA::is_nil (hello.in ())) { @@ -69,35 +66,30 @@ main (int argc, char *argv[]) } CORBA::String_var the_string = - hello->get_string (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->get_string (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n", the_string.in ())); - 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 + catch (const CORBA::Exception& ex) { if (expect_error) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - expected exception occurred!\n%s\n", - ACE_ANY_EXCEPTION._info().c_str())); + ex._info().c_str())); return 0; } else { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } } - ACE_ENDTRY; if (expect_error) { |