diff options
Diffstat (limited to 'TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp | 37 |
1 files changed, 6 insertions, 31 deletions
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp index 407c832a27b..d4e3d3653f2 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp @@ -54,11 +54,9 @@ add_ft_prop (CORBA::ORB_ptr o, o->resolve_initial_references (TAO_OBJID_IORMANIPULATION, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; TAO_IOP::TAO_IOR_Manipulation_var iorm = TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; FT::TagFTGroupTaggedComponent ft_tag_component; @@ -86,7 +84,6 @@ add_ft_prop (CORBA::ORB_ptr o, CORBA::Boolean retval = iorm->set_property (&iogr_prop, obj1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (retval != 0) { @@ -94,7 +91,6 @@ add_ft_prop (CORBA::ORB_ptr o, obj1, obj1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } @@ -106,7 +102,6 @@ add_ft_prop (CORBA::ORB_ptr o, retval = iorm->set_property (&iogr_prop, obj2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (retval != 0) { @@ -114,7 +109,6 @@ add_ft_prop (CORBA::ORB_ptr o, obj2, obj2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } return; @@ -130,7 +124,7 @@ void test_colocal (ForwardRequestTest::test_ptr server "CLIENT: Issuing colocal request %d.\n", i)); CORBA::ULong retval = - server->number (ACE_ENV_SINGLE_ARG_PARAMETER); + server->number (); if (retval != 1 && retval != 317) { // Not a valid return value, forwarding went wrong and @@ -142,7 +136,6 @@ void test_colocal (ForwardRequestTest::test_ptr server } number += retval; - ACE_TRY_CHECK; ACE_DEBUG ((LM_INFO, @@ -174,15 +167,12 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -191,11 +181,9 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; 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; @@ -211,46 +199,38 @@ main (int argc, char *argv[]) poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::ObjectId_var oid1 = first_poa->activate_object (&servant1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::ObjectId_var oid2 = first_poa->activate_object (&servant2 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj1 = first_poa->servant_to_reference (&servant1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj2 = first_poa->servant_to_reference (&servant2 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; (void) add_ft_prop (orb.in (), obj1.in (), obj2.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::String_var ior = orb->object_to_string (obj1.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "ForwardRequestTest::test servant 1: <%s>\n", ior.in ())); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); // Set the forward references in the server request interceptor. PortableInterceptor::ServerRequestInterceptor_var @@ -259,7 +239,6 @@ main (int argc, char *argv[]) ForwardRequestTest::ServerRequestInterceptor_var interceptor = ForwardRequestTest::ServerRequestInterceptor::_narrow ( server_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (interceptor.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -270,7 +249,6 @@ main (int argc, char *argv[]) interceptor->forward_references (obj1.in (), obj2.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Run co-local test { @@ -279,7 +257,7 @@ main (int argc, char *argv[]) test_colocal (server.in() ACE_ENV_ARG_PARAMETER); // Reset interceptor for remote tests - interceptor->reset (ACE_ENV_SINGLE_ARG_PARAMETER); + interceptor->reset (); } // Write each IOR to a file. @@ -296,14 +274,11 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); // Run the ORB event loop. - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); ACE_DEBUG ((LM_DEBUG, "Event loop finished.\n")); } |