diff options
Diffstat (limited to 'TAO/tests/OBV/Forward/server.cpp')
-rw-r--r-- | TAO/tests/OBV/Forward/server.cpp | 50 |
1 files changed, 16 insertions, 34 deletions
diff --git a/TAO/tests/OBV/Forward/server.cpp b/TAO/tests/OBV/Forward/server.cpp index bf17c26cc87..87c4e70ceb0 100644 --- a/TAO/tests/OBV/Forward/server.cpp +++ b/TAO/tests/OBV/Forward/server.cpp @@ -41,11 +41,10 @@ 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, ""); // All factories are kindly provided by // compiler so we just to put everything in a right order. @@ -57,9 +56,7 @@ main (int argc, char *argv[]) 1); orb->register_value_factory (bn_factory->tao_repository_id (), - bn_factory - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + bn_factory); bn_factory->_remove_ref (); // release ownership // Create and register factory for TreeController. @@ -69,9 +66,7 @@ main (int argc, char *argv[]) 1); orb->register_value_factory (tc_factory->tao_repository_id (), - tc_factory - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + tc_factory); tc_factory->_remove_ref (); // release ownership // Create and register factory for StringNode. @@ -81,20 +76,16 @@ main (int argc, char *argv[]) 1); orb->register_value_factory (sn_factory->tao_repository_id (), - sn_factory - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + sn_factory); sn_factory->_remove_ref (); // release ownership //Well, done with factories. CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -102,8 +93,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -115,12 +105,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(test_impl); - Test_var test = test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + Test_var test = test_impl->_this (); CORBA::String_var ior = - orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->object_to_string (test.in ()); // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -132,27 +120,21 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->destroy (1, 1); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + 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 0; } |