diff options
Diffstat (limited to 'TAO/tests/Bug_1482_Regression')
-rw-r--r-- | TAO/tests/Bug_1482_Regression/Client_Task.cpp | 7 | ||||
-rw-r--r-- | TAO/tests/Bug_1482_Regression/Hello.cpp | 2 | ||||
-rw-r--r-- | TAO/tests/Bug_1482_Regression/Hello.h | 2 | ||||
-rw-r--r-- | TAO/tests/Bug_1482_Regression/Reply_Handler.cpp | 6 | ||||
-rw-r--r-- | TAO/tests/Bug_1482_Regression/Server_Task.cpp | 3 | ||||
-rw-r--r-- | TAO/tests/Bug_1482_Regression/client.cpp | 19 | ||||
-rw-r--r-- | TAO/tests/Bug_1482_Regression/server.cpp | 20 |
7 files changed, 14 insertions, 45 deletions
diff --git a/TAO/tests/Bug_1482_Regression/Client_Task.cpp b/TAO/tests/Bug_1482_Regression/Client_Task.cpp index 9710790c0af..d6edf70052d 100644 --- a/TAO/tests/Bug_1482_Regression/Client_Task.cpp +++ b/TAO/tests/Bug_1482_Regression/Client_Task.cpp @@ -43,20 +43,17 @@ Client_Task::svc (void) { this->receiver_->sendc_next_prime (this->handler_var_.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } CORBA::Short repl = 0; while (repl != 25) { CORBA::Boolean pending = - this->orb_->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->work_pending (); if (pending) { - this->orb_->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->perform_work (); ++repl; } diff --git a/TAO/tests/Bug_1482_Regression/Hello.cpp b/TAO/tests/Bug_1482_Regression/Hello.cpp index 40d7a6c63e7..6575cb0bdca 100644 --- a/TAO/tests/Bug_1482_Regression/Hello.cpp +++ b/TAO/tests/Bug_1482_Regression/Hello.cpp @@ -18,7 +18,7 @@ Hello::Hello (CORBA::ORB_ptr orb) } CORBA::ULong -Hello::next_prime (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Hello::next_prime (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, diff --git a/TAO/tests/Bug_1482_Regression/Hello.h b/TAO/tests/Bug_1482_Regression/Hello.h index 58a5fd909b3..7d7fe72e65a 100644 --- a/TAO/tests/Bug_1482_Regression/Hello.h +++ b/TAO/tests/Bug_1482_Regression/Hello.h @@ -17,7 +17,7 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual CORBA::ULong next_prime (ACE_ENV_SINGLE_ARG_DECL) + virtual CORBA::ULong next_prime (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp b/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp index 93189526614..b35f3854035 100644 --- a/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp +++ b/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp @@ -23,8 +23,7 @@ Reply_Handler::next_prime_excep ( ACE_TRY { - ex->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ex->raise_exception (); } ACE_CATCH (CORBA::COMM_FAILURE, t) { @@ -34,10 +33,8 @@ Reply_Handler::next_prime_excep ( ACE_Time_Value tv (10, 0); this->orb_->run (tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -45,5 +42,4 @@ Reply_Handler::next_prime_excep ( "Caught exception:"); } ACE_ENDTRY; - ACE_CHECK; } diff --git a/TAO/tests/Bug_1482_Regression/Server_Task.cpp b/TAO/tests/Bug_1482_Regression/Server_Task.cpp index 8c0dc31bdd1..50d733ca3e7 100644 --- a/TAO/tests/Bug_1482_Regression/Server_Task.cpp +++ b/TAO/tests/Bug_1482_Regression/Server_Task.cpp @@ -19,8 +19,7 @@ Server_Task::svc (void) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->run (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_1482_Regression/client.cpp b/TAO/tests/Bug_1482_Regression/client.cpp index 78a8635a4e5..d994f66207c 100644 --- a/TAO/tests/Bug_1482_Regression/client.cpp +++ b/TAO/tests/Bug_1482_Regression/client.cpp @@ -42,18 +42,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Hello_var hello = Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (hello.in ())) { @@ -65,28 +62,22 @@ main (int argc, char *argv[]) CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; 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 (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); CORBA::Object_var object = orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::PolicyCurrent_var policy_current = CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; TimeBase::TimeT timeout_period = 10 * 1000; @@ -99,12 +90,10 @@ main (int argc, char *argv[]) orb->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, timeout_as_any ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policy_current->set_policy_overrides (policy_list, CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Let the client perform the test in a separate thread @@ -123,10 +112,8 @@ main (int argc, char *argv[]) root_poa->destroy (1, // ethernalize objects 0 // wait for completion ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Bug_1482_Regression/server.cpp b/TAO/tests/Bug_1482_Regression/server.cpp index 2204fc213da..8d35961807b 100644 --- a/TAO/tests/Bug_1482_Regression/server.cpp +++ b/TAO/tests/Bug_1482_Regression/server.cpp @@ -43,15 +43,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -59,8 +56,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; @@ -72,12 +68,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(hello_impl); Test::Hello_var hello = - hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello_impl->_this (); CORBA::String_var ior = orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Output the IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -89,8 +83,7 @@ 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 (); Server_Task st (orb.in (), ACE_Thread_Manager::instance ()); @@ -102,16 +95,13 @@ main (int argc, char *argv[]) return -1; } - 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; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { |