Wed Jan 24 14:00:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

1 files changed, 4 insertions, 17 deletions

diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp
index b457324f6ed..ad1ca25b5d8 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp
@@ -95,7 +95,6 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
                            adminid
                            ACE_ENV_ARG_PARAMETER);
 
-  ACE_CHECK_RETURN (0);
 
   return CosNotifyChannelAdmin::ConsumerAdmin::_duplicate (admin.in ());
 }
@@ -117,10 +116,8 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
                                           *client),
                     CORBA::NO_MEMORY ());
   consumer_1->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   consumer_1->_connect (admin ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 // ******************************************************************
@@ -135,21 +132,17 @@ int main (int argc, char* argv[])
       Consumer_Client client;
 
       status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (status == 0)
         {
           CosNotifyChannelAdmin::EventChannel_var ec =
             client.create_event_channel ("MyEventChannel", 1 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
           CORBA::ORB_ptr orb = client.orb ();
           CORBA::Object_var object =
                               orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
           sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
           if (CORBA::is_nil (sig.in ()))
             {
@@ -161,27 +154,21 @@ int main (int argc, char* argv[])
 
           CosNotifyChannelAdmin::ConsumerAdmin_var admin =
             create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
           if (!CORBA::is_nil (admin.in ()))
             {
               create_consumers (admin.in (), &client ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
               // Tell the supplier to go
-              sig->go (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              sig->go ();
 
               ACE_DEBUG((LM_DEBUG, "Consumer waiting for events...\n"));
 
               client.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER );
-              ACE_TRY_CHECK;
- 
+
               ACE_DEBUG((LM_DEBUG, "Consumer done.\n"));
-              consumer_1->disconnect(ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              consumer_1->disconnect();
 
-              sig->done (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              sig->done ();
             }
         }
     }