1 files changed, 13 insertions, 24 deletions

diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp
index c29daa4ff2a..d147c4c45bd 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp
@@ -7,8 +7,8 @@
 #include "ace/Stats.h"
 #include "ace/Sample_History.h"
 
-ACE_RCSID (Latency_Test, 
-           Latency_Query_Client, 
+ACE_RCSID (Latency_Test,
+           Latency_Query_Client,
            "$Id$")
 
 const CORBA::ULong DEFAULT_NUMCALLS = 20000;
@@ -34,7 +34,6 @@ Latency_Query_Client::init (int argc,
                                     argv,
                                     0
                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       int retval = this->parse_args (argc,
                                      argv);
@@ -47,7 +46,6 @@ Latency_Query_Client::init (int argc,
       CORBA::Object_var object =
         this->orb_->resolve_initial_references ("InterfaceRepository"
                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (object.in ()))
         {
@@ -62,7 +60,6 @@ Latency_Query_Client::init (int argc,
       this->repo_ =
         CORBA::Repository::_narrow (object.in ()
                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->repo_.in ()))
         {
@@ -71,8 +68,7 @@ Latency_Query_Client::init (int argc,
                             -1);
         }
 
-      retval = this->populate_ifr (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      retval = this->populate_ifr ();
 
       if (retval != 0)
         {
@@ -100,8 +96,7 @@ Latency_Query_Client::run (void)
     {
       for (int j = 0; j < 100; ++j)
         {
-          am = this->attr_->mode (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          am = this->attr_->mode ();
 
           if (am != CORBA::ATTR_NORMAL)
             {
@@ -116,8 +111,7 @@ Latency_Query_Client::run (void)
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-          am = this->attr_->mode (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          am = this->attr_->mode ();
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
           history.sample (now - start);
@@ -127,12 +121,12 @@ Latency_Query_Client::run (void)
 
       if (this->debug_)
         {
-          ACE_DEBUG ((LM_DEBUG, 
+          ACE_DEBUG ((LM_DEBUG,
                       "test finished\n"));
-          ACE_DEBUG ((LM_DEBUG, 
+          ACE_DEBUG ((LM_DEBUG,
                       "High resolution timer calibration...."));
           ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-          ACE_DEBUG ((LM_DEBUG, 
+          ACE_DEBUG ((LM_DEBUG,
                       "done\n"));
 
           if (this->do_dump_history_)
@@ -144,7 +138,7 @@ Latency_Query_Client::run (void)
           history.collect_basic_stats (stats);
           stats.dump_results ("Total", gsf);
 
-          ACE_Throughput_Stats::dump_throughput ("Total", 
+          ACE_Throughput_Stats::dump_throughput ("Total",
 											                           gsf,
                                                  test_end - test_start,
                                                  stats.samples_count ());
@@ -152,7 +146,7 @@ Latency_Query_Client::run (void)
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
                           "Latency_Query_Client::run:");
       return -1;
     }
@@ -176,10 +170,10 @@ Latency_Query_Client::parse_args (int argc,
         case 'd':
           this->debug_ = true;
           break;
-        case 'h': 
+        case 'h':
           this->do_dump_history_ = true;
           break;
-        case 'i': 
+        case 'i':
           result = ACE_OS::atoi (opts.opt_arg ());
 
           if (result > 0)
@@ -204,17 +198,15 @@ Latency_Query_Client::parse_args (int argc,
 }
 
 int
-Latency_Query_Client::populate_ifr (ACE_ENV_SINGLE_ARG_DECL)
+Latency_Query_Client::populate_ifr (void)
 {
   CORBA::Contained_var irobj = this->repo_->lookup_id ("IDL:dummy/attr:1.0"
                                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   if (! CORBA::is_nil (irobj.in ()))
     {
       this->attr_ = CORBA::AttributeDef::_narrow (irobj.in ()
                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
 
       if (CORBA::is_nil (this->attr_.in ()))
         {
@@ -236,12 +228,10 @@ Latency_Query_Client::populate_ifr (ACE_ENV_SINGLE_ARG_DECL)
                                    "1.0",
                                    in_bases
                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   CORBA::PrimitiveDef_var p_long =
     this->repo_->get_primitive (CORBA::pk_long
                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   this->attr_ =
     iface->create_attribute ("IDL:dummt/attr:1.0",
@@ -250,7 +240,6 @@ Latency_Query_Client::populate_ifr (ACE_ENV_SINGLE_ARG_DECL)
                              p_long.in (),
                              CORBA::ATTR_NORMAL
                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }