diff options
author | elliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-01-25 18:17:52 +0000 |
---|---|---|
committer | elliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-01-25 18:17:52 +0000 |
commit | 2ee7b7eed4c0cc10f4ec25b186b04202af01b565 (patch) | |
tree | 08a8a649c90559cf5b2228c1caad15515902613e /TAO/tests/Bug_2289_Regression/client.cpp | |
parent | c979767a00db4ea1299af482033a68829cc16675 (diff) | |
download | ATCD-2ee7b7eed4c0cc10f4ec25b186b04202af01b565.tar.gz |
ChangeLogTag: Thu Jan 25 17:39:59 UTC 2007 Chad Elliott <elliott_c@ociweb.com>
Diffstat (limited to 'TAO/tests/Bug_2289_Regression/client.cpp')
-rw-r--r-- | TAO/tests/Bug_2289_Regression/client.cpp | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/TAO/tests/Bug_2289_Regression/client.cpp b/TAO/tests/Bug_2289_Regression/client.cpp index 750710f613c..1f81988cb77 100644 --- a/TAO/tests/Bug_2289_Regression/client.cpp +++ b/TAO/tests/Bug_2289_Regression/client.cpp @@ -42,19 +42,19 @@ int main (int argc, char *argv[]) { int result = 0; - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -78,7 +78,7 @@ main (int argc, char *argv[]) test_impl->_this (); CORBA::String_var ior = - orb->object_to_string (test_ref.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (test_ref.in ()); // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -89,13 +89,12 @@ main (int argc, char *argv[]) } poa_manager->activate (); - ACE_TRY_CHECK CORBA::Object_var tmp = - orb->string_to_object(server_ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(server_ior); MyInterface_var server = - MyInterface::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + MyInterface::_narrow(tmp.in ()); if (CORBA::is_nil (server.in ())) { @@ -106,7 +105,7 @@ main (int argc, char *argv[]) } - CORBA::Boolean temp = server->myMethod (MyInterfaceImpl::my_string ACE_ENV_ARG_PARAMETER); + CORBA::Boolean temp = server->myMethod (MyInterfaceImpl::my_string); if (temp) { @@ -122,13 +121,11 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return result; } |