1 files changed, 15 insertions, 44 deletions

diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
index 9f91b760a0a..596b32de23e 100644
--- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
@@ -28,35 +28,26 @@ main (int argc, char* argv[])
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       CORBA::Object_var object =
         orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       PortableServer::POA_var poa =
         PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
+      poa_manager->activate ();
 
       // ****************************************************************
 
       run_test (poa.in (), 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       run_test (poa.in (), 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // ****************************************************************
 
       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
@@ -75,13 +66,10 @@ deactivate_servant (PortableServer::Servant servant
                     ACE_ENV_ARG_DECL)
 {
   PortableServer::POA_var poa =
-    servant->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    servant->_default_POA ();
   PortableServer::ObjectId_var id =
     poa->servant_to_id (servant ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
   poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 void
@@ -93,12 +81,10 @@ run_test (PortableServer::POA_ptr poa,
   attributes.disconnect_callbacks = use_callbacks;
 
   TAO_EC_Event_Channel ec_impl (attributes);
-  ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  ec_impl.activate ();
 
   RtecEventChannelAdmin::EventChannel_var event_channel =
-    ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ec_impl._this ();
 
   Task task (event_channel.in (), use_callbacks);
 
@@ -110,11 +96,9 @@ run_test (PortableServer::POA_ptr poa,
   // Wait for all the threads to complete and the return
   ACE_Thread_Manager::instance ()->wait ();
 
-  event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  event_channel->destroy ();
 
   deactivate_servant (&ec_impl ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 Task::Task (RtecEventChannelAdmin::EventChannel_ptr ec,
@@ -132,8 +116,7 @@ Task::svc ()
     {
       ACE_TRY_NEW_ENV
         {
-          this->run_iteration (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->run_iteration ();
         }
       ACE_CATCHANY
         {
@@ -145,17 +128,15 @@ Task::svc ()
 }
 
 void
-Task::run_iteration (ACE_ENV_SINGLE_ARG_DECL)
+Task::run_iteration (void)
 {
   // Obtain the consumer admin..
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    this->event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->event_channel->for_consumers ();
 
   // and the supplier admin..
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    this->event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->event_channel->for_suppliers ();
 
   // ****************************************************************
 
@@ -183,40 +164,30 @@ Task::run_iteration (ACE_ENV_SINGLE_ARG_DECL)
       supplier_0.connect (supplier_admin.in (),
                           supplier_qos.get_SupplierQOS ()
                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
       consumer_0.connect (consumer_admin.in (),
                           consumer_qos.get_ConsumerQOS ()
                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
       if (i % 2 == 1)
         {
           supplier_1.connect (supplier_admin.in (),
                               supplier_qos.get_SupplierQOS ()
                               ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
           consumer_1.connect (consumer_admin.in (),
                               consumer_qos.get_ConsumerQOS ()
                               ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
         }
-      supplier_0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-      consumer_0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      supplier_0.disconnect ();
+      consumer_0.disconnect ();
       if (i % 2 == 1)
         {
-          consumer_1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
-          supplier_1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          consumer_1.disconnect ();
+          supplier_1.disconnect ();
         }
     }
 
   deactivate_servant (&supplier_0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   deactivate_servant (&consumer_0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   CORBA::ULong count_0 = 0;
   CORBA::ULong count_1 = 0;