diff options
Diffstat (limited to 'TAO/orbsvcs/tests/FaultTolerance')
14 files changed, 40 insertions, 119 deletions
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp index a446d0d7eff..45a25c7fda0 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp @@ -39,13 +39,11 @@ Server_ORBInitializer::post_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; this->server_interceptor_ = interceptor; info->add_server_request_interceptor (interceptor ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } PortableInterceptor::ServerRequestInterceptor_ptr diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp index fe39a7dc7b6..7151a24463a 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp @@ -47,31 +47,28 @@ Server_Request_Interceptor::forward_references ( char *argv[] = {NULL}; int argc = 0; - + // Fetch the ORB having been initialized in main() CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::String_var str1 = orb->object_to_string (obj1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::String_var str2 = orb->object_to_string (obj2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->obj_[0] = orb->string_to_object (str1.in () ACE_ENV_ARG_PARAMETER); this->obj_[1] = orb->string_to_object (str2.in () ACE_ENV_ARG_PARAMETER); } char * -Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Server_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Server_Request_Interceptor"); } void -Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Server_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::release (this->obj_[0]); @@ -97,7 +94,6 @@ Server_Request_Interceptor::receive_request_service_contexts ( IOP::ServiceContext_var svc = ri->get_request_service_context (IOP::FT_GROUP_VERSION ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // extract the group component TAO_InputCDR cdr (reinterpret_cast<const char*> (svc->context_data.get_buffer ()), @@ -155,7 +151,6 @@ Server_Request_Interceptor::receive_request ( IOP::ServiceContext_var svc = ri->get_request_service_context (IOP::FT_GROUP_VERSION ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // extract the group component TAO_InputCDR cdr (reinterpret_cast<const char*> (svc->context_data.get_buffer ()), diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h index d8a5ce664cf..6c50f49e8e7 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h @@ -55,7 +55,7 @@ public: ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - /// Reset to initial state, like counter etc, keeps the object-references + /// Reset to initial state, like counter etc, keeps the object-references virtual void reset (ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -70,10 +70,10 @@ public: */ //@{ /// Return the name of this ServerRequestinterceptor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request_service_contexts ( diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp index 58fd3cc610b..ac5c1e777d2 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp @@ -46,7 +46,6 @@ main (int argc, char *argv[]) argv, "Client ORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (::parse_args (argc, argv) != 0) return -1; @@ -56,11 +55,9 @@ main (int argc, char *argv[]) // this test. CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ForwardRequestTest::test_var server = ForwardRequestTest::test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Before and after the LOCATION_FORWARD_PERM the marshaled // object reference must differ. @@ -84,8 +81,7 @@ main (int argc, char *argv[]) "CLIENT: Issuing request %d.\n", i)); - number += server->number (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + number += server->number (); ACE_DEBUG ((LM_INFO, "CLIENT: Number %d .\n", @@ -116,8 +112,7 @@ main (int argc, char *argv[]) ACE_OS::abort (); } - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); } ACE_CATCHANY { 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")); } diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp index adafe5be28d..122324ab774 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp @@ -18,14 +18,14 @@ test_i::~test_i (void) } CORBA::Short -test_i::number (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::number (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->number_; } void -test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.h b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.h index 34f6bcbdbc3..d22fba97d4c 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.h +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.h @@ -33,11 +33,11 @@ public: ~test_i (void); /// Return the number assigned to this object. - virtual CORBA::Short number (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Short number (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Shutdown the ORB. - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h index 110808818f7..5b95112cdf1 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h @@ -33,7 +33,7 @@ public: Client_i (CORBA::ORB_ptr orb); // Our constructor - void init (ACE_ENV_SINGLE_ARG_DECL); + void init (void); // Initialize the ORB etc. private: diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp index 543da3eff4f..87fc72368e8 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp @@ -72,20 +72,17 @@ main (int argc, manager.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // the command line arguments if (parse_args (argc, argv) == -1) return -1; // Merge the different IORS - manager.make_merged_iors (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + manager.make_merged_iors (); // Set properties. This is the most important portion of the // test - manager.set_properties (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + manager.set_properties (); // Write IOR to file manager.write_to_file (); @@ -93,8 +90,7 @@ main (int argc, // Client, who is going to use the merged IOR // Construct that with the managers ORB Client_i client_imp (manager.orb ()); - client_imp.init (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + client_imp.init (); } ACE_CATCHANY { @@ -123,53 +119,44 @@ Manager::init (int argc, argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Obtain the RootPOA. CORBA::Object_var obj_var = this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa_var = PortableServer::POA::_narrow (obj_var.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager_var = - root_poa_var->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + root_poa_var->the_POAManager (); - poa_manager_var->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + poa_manager_var->activate (); } int -Manager::make_merged_iors (ACE_ENV_SINGLE_ARG_DECL) +Manager::make_merged_iors (void) { // First server object_primary = this->orb_->string_to_object (first_ior ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); //Second server object_secondary = this->orb_->string_to_object (second_ior ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Get an object reference for the ORBs IORManipultion object! CORBA::Object_var IORM = this->orb_->resolve_initial_references (TAO_OBJID_IORMANIPULATION, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); iorm = TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Create the list @@ -181,13 +168,12 @@ Manager::make_merged_iors (ACE_ENV_SINGLE_ARG_DECL) // Create a merged set 1; merged_set_ = iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); return 0; } int -Manager::set_properties (ACE_ENV_SINGLE_ARG_DECL) +Manager::set_properties (void) { FT::TagFTGroupTaggedComponent ft_tag_component; @@ -216,7 +202,6 @@ Manager::set_properties (ACE_ENV_SINGLE_ARG_DECL) CORBA::Boolean retval = iorm->set_property (&iogr_prop, this->merged_set_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Set the primary // See we are setting the second ior as the primary @@ -226,19 +211,17 @@ Manager::set_properties (ACE_ENV_SINGLE_ARG_DECL) object_secondary.in (), this->merged_set_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); } return 0; } int -Manager::run (ACE_ENV_SINGLE_ARG_DECL) +Manager::run (void) { ACE_TRY { - this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->run (); } ACE_CATCHANY { @@ -289,7 +272,7 @@ run_test (Simple_Server_ptr server ACE_ENV_ARG_DECL); void -Client_i::init (ACE_ENV_SINGLE_ARG_DECL) +Client_i::init (void) { // Open the file for reading. ACE_HANDLE f_handle = ACE_OS::open (ior_output_file, @@ -315,18 +298,15 @@ Client_i::init (ACE_ENV_SINGLE_ARG_DECL) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Object_var object = this->orb_->string_to_object (data ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Combined IOR stuff Simple_Server_var server = Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil (server.in ())) { @@ -337,7 +317,6 @@ Client_i::init (ACE_ENV_SINGLE_ARG_DECL) run_test (server.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ior_buffer.alloc ()->free (data); ACE_OS::close (f_handle); @@ -359,16 +338,14 @@ void run_test (Simple_Server_ptr server j++) { // Make a remote call - server->remote_call (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->remote_call (); } ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("*********************************\n"))); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("I am going to shutdown the server\n"))); - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); ACE_OS::sleep (2); } ACE_CATCH (CORBA::TRANSIENT, t) @@ -399,6 +376,5 @@ void run_test (Simple_Server_ptr server ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK; } } diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h index 6bdc3e7cf1c..f31970bd98f 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h @@ -41,13 +41,13 @@ public: // Initialize the ORB, POA etc. - int make_merged_iors (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); + int make_merged_iors (void); // Merges the different IORS - int set_properties (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); + int set_properties (void); // Sets the properties for the profiles - int run (ACE_ENV_SINGLE_ARG_DECL); + int run (void); // Run the ORB event loop.. int write_to_file (void); diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp index ade1a560f4d..4b8a80b26d6 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp @@ -41,14 +41,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // We do the command line parsing first if (parse_args (argc, argv) != 0) return 1; 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, @@ -57,22 +55,18 @@ 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 (); // Instantiate the LCD_Display implementation class Simple_Server_i display_impl (orb.in ()); Simple_Server_var server = - display_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + display_impl._this (); CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -89,8 +83,7 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); orb->run (); diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp index 9813825c275..d16bb668f1d 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp @@ -31,7 +31,7 @@ Simple_Server_i::remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ void -Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Simple_Server_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h index f7944307d55..d9cdfe56754 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h @@ -34,10 +34,10 @@ public: // ctor // = The Simple_Server methods. - void remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void remote_call (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp index 72014970c1d..30ea67466a3 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp @@ -40,7 +40,6 @@ main (int argc, char *argv[]) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // ********************************************************************** // Get an object reference for the ORBs IORManipulation object! @@ -48,23 +47,19 @@ main (int argc, char *argv[]) orb_->resolve_initial_references (TAO_OBJID_IORMANIPULATION, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; TAO_IOP::TAO_IOR_Manipulation_var iorm = TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // ********************************************************************** // Create a few fictitious IORs CORBA::Object_var name1 = orb_->string_to_object ("iiop://acme.cs.wustl.edu:6060/xyz" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var name2 = orb_->string_to_object ("iiop://tango.cs.wustl.edu:7070/xyz" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // ********************************************************************** // Create IOR list for use with merge_iors. @@ -76,7 +71,6 @@ main (int argc, char *argv[]) CORBA::Object_var merged = iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Check for set and get primaries // Make a dummy property set @@ -85,7 +79,6 @@ main (int argc, char *argv[]) CORBA::Boolean retval = iorm->set_primary (&prop, name2.in (), merged.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (retval != 0) ACE_DEBUG ((LM_DEBUG, @@ -101,7 +94,6 @@ main (int argc, char *argv[]) retval = iorm->is_primary_set (&prop, merged.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (retval) ACE_DEBUG ((LM_DEBUG, @@ -121,7 +113,6 @@ main (int argc, char *argv[]) iorm->get_primary (&prop, merged.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Check whether we got back the right primary if (prim->_is_equivalent (name2.in ())) @@ -161,7 +152,6 @@ main (int argc, char *argv[]) retval = iorm->set_property (&prop, merged.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; /// Extract the property FT::TagFTGroupTaggedComponent ftc; @@ -172,7 +162,6 @@ main (int argc, char *argv[]) ftc ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) Testing for tagged component \n")); |