1 files changed, 3 insertions, 19 deletions

diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
index b271606a0fb..c394e740d43 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
@@ -52,14 +52,14 @@ TAO_LB_LoadMinimum::~TAO_LB_LoadMinimum (void)
 }
 
 char *
-TAO_LB_LoadMinimum::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_LoadMinimum::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("LoadMinimum");
 }
 
 CosLoadBalancing::Properties *
-TAO_LB_LoadMinimum::get_properties (ACE_ENV_SINGLE_ARG_DECL)
+TAO_LB_LoadMinimum::get_properties (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosLoadBalancing::Properties * props = 0;
@@ -70,7 +70,6 @@ TAO_LB_LoadMinimum::get_properties (ACE_ENV_SINGLE_ARG_DECL)
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   return props;
 }
@@ -166,13 +165,11 @@ TAO_LB_LoadMinimum::get_loads (CosLoadBalancing::LoadManager_ptr load_manager,
   CosLoadBalancing::LoadList_var loads =
     load_manager->get_loads (the_location
                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
 
   this->push_loads (the_location,
                     loads.in (),
                     loads[0]
                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
 
   return loads._retn ();
 }
@@ -194,7 +191,6 @@ TAO_LB_LoadMinimum::next_member (
   PortableGroup::Locations_var locations =
     load_manager->locations_of_members (object_group
                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   if (locations->length () == 0)
     ACE_THROW_RETURN (CORBA::TRANSIENT (),
@@ -209,7 +205,6 @@ TAO_LB_LoadMinimum::next_member (
                         locations.in (),
                         location
                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   if (found_location)
     {
@@ -259,7 +254,6 @@ TAO_LB_LoadMinimum::analyze_loads (
   PortableGroup::Locations_var locations =
     load_manager->locations_of_members (object_group
                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   if (locations->length () == 0)
     ACE_THROW (CORBA::TRANSIENT ());
@@ -288,14 +282,12 @@ TAO_LB_LoadMinimum::analyze_loads (
           CosLoadBalancing::LoadList_var current_loads =
             load_manager->get_loads (loc
                                      ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
           CosLoadBalancing::Load load;
           this->push_loads (loc,
                             current_loads.in (),
                             load
                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
           total_load.value = total_load.value + load.value;
           tmp[i] = load;
@@ -318,7 +310,6 @@ TAO_LB_LoadMinimum::analyze_loads (
           //
         }
       ACE_ENDTRY;
-      ACE_CHECK;
     }
 
   avg_load.value = total_load.value / len;
@@ -400,13 +391,12 @@ TAO_LB_LoadMinimum::analyze_loads (
           //
         }
       ACE_ENDTRY;
-      ACE_CHECK;
     }
 
 }
 
 PortableServer::POA_ptr
-TAO_LB_LoadMinimum::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_LoadMinimum::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -440,7 +430,6 @@ TAO_LB_LoadMinimum::get_location (
           CosLoadBalancing::LoadList_var current_loads =
             load_manager->get_loads (loc
                                      ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
           found_load = 1;
 
@@ -449,7 +438,6 @@ TAO_LB_LoadMinimum::get_location (
                             current_loads.in (),
                             load
                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 /*
           ACE_DEBUG ((LM_DEBUG,
                       "LOC == %u"
@@ -555,7 +543,6 @@ TAO_LB_LoadMinimum::get_location (
           // next location.
         }
       ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
     }
 
 //   ACE_DEBUG ((LM_DEBUG,
@@ -599,7 +586,6 @@ TAO_LB_LoadMinimum::init (const PortableGroup::Properties & props
           this->extract_float_property (property,
                                         tolerance
                                         ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
 
           // Valid tolerance values are greater than or equal to one.
           if (tolerance < 1)
@@ -613,7 +599,6 @@ TAO_LB_LoadMinimum::init (const PortableGroup::Properties & props
           this->extract_float_property (property,
                                         dampening
                                         ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
 
           // Dampening range is [0,1).
           if (dampening < 0 || dampening >= 1)
@@ -627,7 +612,6 @@ TAO_LB_LoadMinimum::init (const PortableGroup::Properties & props
           this->extract_float_property (property,
                                         per_balance_load
                                         ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
         }
     }