diff options
Diffstat (limited to 'TAO/orbsvcs/tests/Security/BiDirectional/client.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/Security/BiDirectional/client.cpp | 41 |
1 files changed, 17 insertions, 24 deletions
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp index 196d9a21348..41c5ec1bd6d 100644 --- a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp +++ b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp @@ -46,13 +46,13 @@ 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); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -60,7 +60,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -73,8 +73,7 @@ main (int argc, char *argv[]) pol <<= BiDirPolicy::BOTH; policies[0] = orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE, - pol - ACE_ENV_ARG_PARAMETER); + pol); // Create POA as child of RootPOA with the above policies. This POA // will receive request in the same connection in which it sent @@ -82,8 +81,7 @@ main (int argc, char *argv[]) PortableServer::POA_var child_poa = root_poa->create_POA ("childPOA", poa_manager.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); // Creation of childPOA is over. Destroy the Policy objects. for (CORBA::ULong i = 0; @@ -99,10 +97,10 @@ main (int argc, char *argv[]) return 1; CORBA::Object_var object = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); Simple_Server_var server = - Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Simple_Server::_narrow (object.in ()); if (CORBA::is_nil (server.in ())) { @@ -119,25 +117,22 @@ main (int argc, char *argv[]) PortableServer::string_to_ObjectId ("client_callback"); child_poa->activate_object_with_id (id.in (), - &callback_impl - ACE_ENV_ARG_PARAMETER); + &callback_impl); CORBA::Object_var callback_object = - child_poa->id_to_reference (id.in () - ACE_ENV_ARG_PARAMETER); + child_poa->id_to_reference (id.in ()); Callback_var callback = - Callback::_narrow (callback_object.in () ACE_ENV_ARG_PARAMETER); + Callback::_narrow (callback_object.in ()); CORBA::String_var ior = - orb->object_to_string (callback.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (callback.in ()); ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client callback activated as <%s>\n", ior.in ())); // Send the calback object to the server - server->callback_object (callback.in () - ACE_ENV_ARG_PARAMETER); + server->callback_object (callback.in ()); // This is a non-portable, but the only currently available way of // determining the number of currently open connections. @@ -146,7 +141,7 @@ main (int argc, char *argv[]) // A method to kickstart callbacks from the server CORBA::Long r = - server->test_method (1 ACE_ENV_ARG_PARAMETER); + server->test_method (1); if (r != 0) { @@ -174,16 +169,14 @@ main (int argc, char *argv[]) ACE_OS::abort (); } - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } |