diff options
Diffstat (limited to 'TAO/tests/MT_BiDir')
| -rw-r--r-- | TAO/tests/MT_BiDir/Client_Task.cpp | 1 | ||||
| -rw-r--r-- | TAO/tests/MT_BiDir/Sender_i.cpp | 3 | ||||
| -rw-r--r-- | TAO/tests/MT_BiDir/Sender_i.h | 2 | ||||
| -rw-r--r-- | TAO/tests/MT_BiDir/Server_Task.cpp | 3 | ||||
| -rw-r--r-- | TAO/tests/MT_BiDir/client.cpp | 21 | ||||
| -rw-r--r-- | TAO/tests/MT_BiDir/server.cpp | 19 |
6 files changed, 10 insertions, 39 deletions
diff --git a/TAO/tests/MT_BiDir/Client_Task.cpp b/TAO/tests/MT_BiDir/Client_Task.cpp index 58b598b90e1..8564f9d98ef 100644 --- a/TAO/tests/MT_BiDir/Client_Task.cpp +++ b/TAO/tests/MT_BiDir/Client_Task.cpp @@ -25,7 +25,6 @@ Client_Task::svc (void) ACE_TRY { this->orb_->run (tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/MT_BiDir/Sender_i.cpp b/TAO/tests/MT_BiDir/Sender_i.cpp index 780f39d18ad..c27adf89fe6 100644 --- a/TAO/tests/MT_BiDir/Sender_i.cpp +++ b/TAO/tests/MT_BiDir/Sender_i.cpp @@ -57,7 +57,7 @@ Sender_i::receiver_object (Receiver_ptr recv void -Sender_i::send_message (ACE_ENV_SINGLE_ARG_DECL) +Sender_i::send_message (void) { // NOTE:No synchronization with purpose. Synchrnozing this is // going to spoil the whole purpose of this test. @@ -66,5 +66,4 @@ Sender_i::send_message (ACE_ENV_SINGLE_ARG_DECL) this->receivers_[send_to]->receive_payload (this->payload_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/MT_BiDir/Sender_i.h b/TAO/tests/MT_BiDir/Sender_i.h index 91b4b729db0..b68d1c03525 100644 --- a/TAO/tests/MT_BiDir/Sender_i.h +++ b/TAO/tests/MT_BiDir/Sender_i.h @@ -30,7 +30,7 @@ public: Sender::Table_Full)); /// Public method defined locally - void send_message (ACE_ENV_SINGLE_ARG_DECL); + void send_message (void); private: /// Synchronizing acces to this class diff --git a/TAO/tests/MT_BiDir/Server_Task.cpp b/TAO/tests/MT_BiDir/Server_Task.cpp index 846fde96ea4..0112e68565d 100644 --- a/TAO/tests/MT_BiDir/Server_Task.cpp +++ b/TAO/tests/MT_BiDir/Server_Task.cpp @@ -55,8 +55,7 @@ Server_Task::svc (void) if (i%50 == 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) Sending message ....\n")); - this->sender_->send_message (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->sender_->send_message (); // Sanity check for connections.. if (connection_no < diff --git a/TAO/tests/MT_BiDir/client.cpp b/TAO/tests/MT_BiDir/client.cpp index 23566a7d242..2219a95abc5 100644 --- a/TAO/tests/MT_BiDir/client.cpp +++ b/TAO/tests/MT_BiDir/client.cpp @@ -45,14 +45,12 @@ 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 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, @@ -61,11 +59,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 (); // Policies for the childPOA to be created. CORBA::PolicyList policies (1); @@ -77,7 +73,6 @@ main (int argc, char *argv[]) orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE, pol ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Create POA as child of RootPOA with the above policies. This POA // will receive request in the same connection in which it sent @@ -87,29 +82,24 @@ main (int argc, char *argv[]) poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Creation of childPOA is over. Destroy the Policy objects. for (CORBA::ULong i = 0; i < policies.length (); ++i) { - policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policies[i]->destroy (); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Sender_var sender = Sender::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (sender.in ())) { @@ -128,13 +118,11 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer (receiver); Receiver_var receiver_obj = - receiver->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + receiver->_this (); // Send the calback object to the server sender->receiver_object (receiver_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Threads that will handle the call backs Client_Task client_task (orb.in (), @@ -157,7 +145,6 @@ main (int argc, char *argv[]) root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/MT_BiDir/server.cpp b/TAO/tests/MT_BiDir/server.cpp index 7aeeeecdbc8..4876eec1af4 100644 --- a/TAO/tests/MT_BiDir/server.cpp +++ b/TAO/tests/MT_BiDir/server.cpp @@ -61,7 +61,6 @@ 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; @@ -69,7 +68,6 @@ main (int argc, char *argv[]) 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, @@ -79,11 +77,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 (); // Policies for the childPOA to be created. CORBA::PolicyList policies (1); @@ -95,7 +91,6 @@ main (int argc, char *argv[]) orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE, pol ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Create POA as child of RootPOA with the above policies. This POA // will receive request in the same connection in which it sent @@ -105,19 +100,16 @@ main (int argc, char *argv[]) poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Creation of childPOA is over. Destroy the Policy objects. for (CORBA::ULong i = 0; i < policies.length (); ++i) { - policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policies[i]->destroy (); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); ACE_Manual_Event manual_event; @@ -132,17 +124,14 @@ main (int argc, char *argv[]) PortableServer::ObjectId_var id = child_poa->activate_object (sender ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj = child_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::String_var ior = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -183,7 +172,6 @@ main (int argc, char *argv[]) // Call the ORB run from the main thread orb->run (tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) event loop finished\n")); } @@ -193,7 +181,6 @@ main (int argc, char *argv[]) root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { |