1 files changed, 4 insertions, 14 deletions

diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp
index c068138c6b8..c1459691f7f 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp
@@ -24,11 +24,9 @@ Client_Task::svc (void)
     {
       CORBA::Object_var obj =
         this->corb_->string_to_object (input_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       Test_Interceptors::Visual_var server =
         Test_Interceptors::Visual::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -39,13 +37,10 @@ Client_Task::svc (void)
         }
 
       run_test (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
 
       this->corb_->destroy();
-      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
@@ -63,27 +58,23 @@ Client_Task::run_test (Test_Interceptors::Visual_ptr server
                        ACE_ENV_ARG_DECL)
 {
   server->normal (10 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
 
-  server->nothing (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  server->nothing ();
 
   ACE_TRY
     {
-      server->user (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->user ();
     }
   ACE_CATCH (Test_Interceptors::Silly, userex)
     {
       ACE_DEBUG ((LM_DEBUG, "Caught Silly\n"));
     }
   ACE_ENDTRY;
-  ACE_CHECK;
 
   ACE_TRY_EX (SYS)
     {
-      server->system (ACE_ENV_SINGLE_ARG_PARAMETER);
+      server->system ();
       ACE_TRY_CHECK_EX (SYS);
     }
   ACE_CATCH (CORBA::INV_OBJREF, sysex)
@@ -91,5 +82,4 @@ Client_Task::run_test (Test_Interceptors::Visual_ptr server
       ACE_DEBUG ((LM_DEBUG, "Caught CORBA::INV_OBJREF\n"));
     }
   ACE_ENDTRY;
-  ACE_CHECK;
 }