*** empty log message ***

22 files changed, 185 insertions, 85 deletions

diff --git a/TAO/orbsvcs/orbsvcs/LB_GenericFactory.cpp b/TAO/orbsvcs/orbsvcs/LB_GenericFactory.cpp
index 4c33b802490..aa21aff170f 100644
--- a/TAO/orbsvcs/orbsvcs/LB_GenericFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/LB_GenericFactory.cpp
@@ -2,7 +2,6 @@
 
 #include "LB_GenericFactory.h"
 #include "LB_ReplicaInfo.h"
-#include "LB_Location_Map.h"
 #include "LB_ObjectGroup_Map.h"
 #include "LB_PropertyManager.h"
 
@@ -187,7 +186,7 @@ TAO_LB_GenericFactory::delete_object (
       // The ObjectId for the newly created object group is comprised
       // solely of the FactoryCreationId.
       PortableServer::ObjectId_var oid;
-      this->get_ObjectId (fcid, oid.out ());      
+      this->get_ObjectId (fcid, oid.out ());
 
       TAO_LB_ObjectGroup_Map_Entry *object_group = 0;
 
@@ -198,7 +197,7 @@ TAO_LB_GenericFactory::delete_object (
 
       {
         ACE_GUARD (TAO_SYNCH_MUTEX, guard, object_group->lock);
-        for (TAO_LB_ReplicaInfo_Set_Iterator i = replica_infos.begin ();
+        for (TAO_LB_ReplicaInfo_Set::iterator i = replica_infos.begin ();
              i != replica_infos.end ();
              ++i)
           {
@@ -251,6 +250,9 @@ TAO_LB_GenericFactory::populate_object_group (
   CORBA::ULong factory_infos_count = factory_infos.length ();
   for (CORBA::ULong j = 0; j < factory_infos_count; ++j)
     {
+      TAO_LB_Location_Map_Entry *location_entry = 0;
+      auto_ptr<TAO_LB_Location_Map_Entry> safe_location_entry;
+
       const LoadBalancing::FactoryInfo &factory_info =
         factory_infos[j];
 
@@ -273,6 +275,7 @@ TAO_LB_GenericFactory::populate_object_group (
                                     location_entry) != 0)
         {
           ACE_NEW_THROW_EX (location_entry,
+                            TAO_LB_Location_Map_Entry,
                             CORBA::NO_MEMORY (
                               CORBA::SystemException::_tao_minor_code (
                                 TAO_DEFAULT_MINOR_CODE,
@@ -280,13 +283,15 @@ TAO_LB_GenericFactory::populate_object_group (
                               CORBA::COMPLETED_NO));
           ACE_CHECK;
 
-          safe_location_entry = location_entry;
+          ACE_AUTO_PTR_RESET (safe_location_entry,
+                              location_entry,
+                              TAO_LB_Location_Map_Entry);
 
           if (this->location_map_.bind (factory_info.the_location,
                                         location_entry) != 0)
             ACE_THROW (LoadBalancing::ObjectNotCreated ());
         }
-        
+
 #if 0
       // @@ Should an "_is_a()" be performed here?  While it appears
       //    to be the right thing to do, it can be expensive.
diff --git a/TAO/orbsvcs/orbsvcs/LB_GenericFactory.h b/TAO/orbsvcs/orbsvcs/LB_GenericFactory.h
index 12b221f8722..bc077397c10 100644
--- a/TAO/orbsvcs/orbsvcs/LB_GenericFactory.h
+++ b/TAO/orbsvcs/orbsvcs/LB_GenericFactory.h
@@ -23,12 +23,11 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/PortableServer/PortableServerC.h"
-
 #include "orbsvcs/LoadBalancingC.h"
 
+#include "LB_Location_Map.h"
 
 /// Forward declarations.
-class TAO_LB_Location_Map;
 class TAO_LB_ObjectGroup_Map;
 class TAO_LB_PropertyManager;
 
diff --git a/TAO/orbsvcs/orbsvcs/LB_Location_Map.cpp b/TAO/orbsvcs/orbsvcs/LB_Location_Map.cpp
index 4dc143db217..f2033761317 100644
--- a/TAO/orbsvcs/orbsvcs/LB_Location_Map.cpp
+++ b/TAO/orbsvcs/orbsvcs/LB_Location_Map.cpp
@@ -10,17 +10,17 @@ ACE_RCSID (LoadBalancing,
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 template class ACE_Hash_Map_Entry<LoadBalancing::Location, TAO_LB_Location_Map_Entry>;
-template class ACE_Hash_Map_Manager_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Iterator_Base_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Iterator_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Manager_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Iterator_Base_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Iterator_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 #pragma instantiate ACE_Hash_Map_Entry<LoadBalancing::Location, TAO_LB_Location_Map_Entry>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/LB_Location_Map.h b/TAO/orbsvcs/orbsvcs/LB_Location_Map.h
index 13b598c63ab..d03947d6a2f 100644
--- a/TAO/orbsvcs/orbsvcs/LB_Location_Map.h
+++ b/TAO/orbsvcs/orbsvcs/LB_Location_Map.h
@@ -35,7 +35,7 @@
  * @brief Value field (internal ID) of the location hash map.
  *
  * Structure that contains all information corresponding to a given
- * location.  
+ * location.
  */
 struct TAO_LB_Location_Map_Entry
 {
@@ -56,7 +56,7 @@ struct TAO_LB_Location_Map_Entry
 /// Location hash map.
 typedef ACE_Hash_Map_Manager_Ex<
   LoadBalancing::Location,
-  TAO_LB_Location_Map_Entry,
+  TAO_LB_Location_Map_Entry *,
   TAO_LB_Location_Hash,
   TAO_LB_Location_Equal_To,
   TAO_SYNCH_MUTEX> TAO_LB_Location_Map;
diff --git a/TAO/orbsvcs/orbsvcs/LB_Minimum_Dispersion.cpp b/TAO/orbsvcs/orbsvcs/LB_Minimum_Dispersion.cpp
index 27e1b605df7..6c774880b2c 100644
--- a/TAO/orbsvcs/orbsvcs/LB_Minimum_Dispersion.cpp
+++ b/TAO/orbsvcs/orbsvcs/LB_Minimum_Dispersion.cpp
@@ -1,6 +1,7 @@
 // -*- C++ -*-
 
 #include "LB_Minimum_Dispersion.h"
+#include "LB_Location_Map.h"
 #include "LB_ObjectGroup_Map.h"
 //#include "ReplicaProxy.h"
 
@@ -51,7 +52,7 @@ TAO_LB_Minimum_Dispersion_Strategy::replica (
 
           // @@ Hardcode one load and don't bother checking the
           // LoadId, for now.  (just to get things going)
-          if (d[CORBA::ULong (0)].value > load[CORBA::ULong (0)].value)
+          if ((*d)[CORBA::ULong (0)].value > (*load)[CORBA::ULong (0)].value)
             {
               replica_info = *i;
               d = (*i)->location_entry->load_list.ptr ();
diff --git a/TAO/orbsvcs/orbsvcs/LB_ObjectGroupManager.h b/TAO/orbsvcs/orbsvcs/LB_ObjectGroupManager.h
index d523a05313e..3a8531b7584 100644
--- a/TAO/orbsvcs/orbsvcs/LB_ObjectGroupManager.h
+++ b/TAO/orbsvcs/orbsvcs/LB_ObjectGroupManager.h
@@ -22,9 +22,10 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "LB_Location_Map.h"
+
 
 /// Forward declarations.
-class TAO_LB_Location_Map;
 class TAO_LB_ObjectGroup_Map;
 class TAO_LB_PropertyManager;
 
diff --git a/TAO/orbsvcs/orbsvcs/LB_PropertyManager.cpp b/TAO/orbsvcs/orbsvcs/LB_PropertyManager.cpp
index a33bf726d22..5bdf9d4daf1 100644
--- a/TAO/orbsvcs/orbsvcs/LB_PropertyManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/LB_PropertyManager.cpp
@@ -121,7 +121,7 @@ TAO_LB_PropertyManager::set_properties_dynamically (
   this->validate_properties (overrides, ACE_TRY_ENV);
   ACE_CHECK;
 
-  ACE_THROW (CORBA::NO_IMPLEMENT ());  
+  ACE_THROW (CORBA::NO_IMPLEMENT ());
 }
 
 LoadBalancing::Properties *
diff --git a/TAO/orbsvcs/orbsvcs/LB_ReplicaInfo.h b/TAO/orbsvcs/orbsvcs/LB_ReplicaInfo.h
index fc4578ca6ac..897b5b8f2e0 100644
--- a/TAO/orbsvcs/orbsvcs/LB_ReplicaInfo.h
+++ b/TAO/orbsvcs/orbsvcs/LB_ReplicaInfo.h
@@ -25,6 +25,9 @@
 
 #include "orbsvcs/LoadBalancingC.h"
 
+// Forward declarations.
+struct TAO_LB_Location_Map_Entry;
+
 class TAO_LB_ReplicaInfo;
 typedef ACE_Unbounded_Set<TAO_LB_ReplicaInfo *> TAO_LB_ReplicaInfo_Set;
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_GenericFactory.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_GenericFactory.cpp
index 4c33b802490..aa21aff170f 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_GenericFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_GenericFactory.cpp
@@ -2,7 +2,6 @@
 
 #include "LB_GenericFactory.h"
 #include "LB_ReplicaInfo.h"
-#include "LB_Location_Map.h"
 #include "LB_ObjectGroup_Map.h"
 #include "LB_PropertyManager.h"
 
@@ -187,7 +186,7 @@ TAO_LB_GenericFactory::delete_object (
       // The ObjectId for the newly created object group is comprised
       // solely of the FactoryCreationId.
       PortableServer::ObjectId_var oid;
-      this->get_ObjectId (fcid, oid.out ());      
+      this->get_ObjectId (fcid, oid.out ());
 
       TAO_LB_ObjectGroup_Map_Entry *object_group = 0;
 
@@ -198,7 +197,7 @@ TAO_LB_GenericFactory::delete_object (
 
       {
         ACE_GUARD (TAO_SYNCH_MUTEX, guard, object_group->lock);
-        for (TAO_LB_ReplicaInfo_Set_Iterator i = replica_infos.begin ();
+        for (TAO_LB_ReplicaInfo_Set::iterator i = replica_infos.begin ();
              i != replica_infos.end ();
              ++i)
           {
@@ -251,6 +250,9 @@ TAO_LB_GenericFactory::populate_object_group (
   CORBA::ULong factory_infos_count = factory_infos.length ();
   for (CORBA::ULong j = 0; j < factory_infos_count; ++j)
     {
+      TAO_LB_Location_Map_Entry *location_entry = 0;
+      auto_ptr<TAO_LB_Location_Map_Entry> safe_location_entry;
+
       const LoadBalancing::FactoryInfo &factory_info =
         factory_infos[j];
 
@@ -273,6 +275,7 @@ TAO_LB_GenericFactory::populate_object_group (
                                     location_entry) != 0)
         {
           ACE_NEW_THROW_EX (location_entry,
+                            TAO_LB_Location_Map_Entry,
                             CORBA::NO_MEMORY (
                               CORBA::SystemException::_tao_minor_code (
                                 TAO_DEFAULT_MINOR_CODE,
@@ -280,13 +283,15 @@ TAO_LB_GenericFactory::populate_object_group (
                               CORBA::COMPLETED_NO));
           ACE_CHECK;
 
-          safe_location_entry = location_entry;
+          ACE_AUTO_PTR_RESET (safe_location_entry,
+                              location_entry,
+                              TAO_LB_Location_Map_Entry);
 
           if (this->location_map_.bind (factory_info.the_location,
                                         location_entry) != 0)
             ACE_THROW (LoadBalancing::ObjectNotCreated ());
         }
-        
+
 #if 0
       // @@ Should an "_is_a()" be performed here?  While it appears
       //    to be the right thing to do, it can be expensive.
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_GenericFactory.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_GenericFactory.h
index 12b221f8722..bc077397c10 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_GenericFactory.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_GenericFactory.h
@@ -23,12 +23,11 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/PortableServer/PortableServerC.h"
-
 #include "orbsvcs/LoadBalancingC.h"
 
+#include "LB_Location_Map.h"
 
 /// Forward declarations.
-class TAO_LB_Location_Map;
 class TAO_LB_ObjectGroup_Map;
 class TAO_LB_PropertyManager;
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Map.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Map.cpp
index 4dc143db217..f2033761317 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Map.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Map.cpp
@@ -10,17 +10,17 @@ ACE_RCSID (LoadBalancing,
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 template class ACE_Hash_Map_Entry<LoadBalancing::Location, TAO_LB_Location_Map_Entry>;
-template class ACE_Hash_Map_Manager_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Iterator_Base_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Iterator_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Manager_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Iterator_Base_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Iterator_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 #pragma instantiate ACE_Hash_Map_Entry<LoadBalancing::Location, TAO_LB_Location_Map_Entry>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<LoadBalancing::Location, TAO_LB_Location_Map_Entry *, TAO_LB_Location_Hash, TAO_LB_Location_Equal_To, TAO_SYNCH_MUTEX>
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Map.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Map.h
index 13b598c63ab..d03947d6a2f 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Map.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Map.h
@@ -35,7 +35,7 @@
  * @brief Value field (internal ID) of the location hash map.
  *
  * Structure that contains all information corresponding to a given
- * location.  
+ * location.
  */
 struct TAO_LB_Location_Map_Entry
 {
@@ -56,7 +56,7 @@ struct TAO_LB_Location_Map_Entry
 /// Location hash map.
 typedef ACE_Hash_Map_Manager_Ex<
   LoadBalancing::Location,
-  TAO_LB_Location_Map_Entry,
+  TAO_LB_Location_Map_Entry *,
   TAO_LB_Location_Hash,
   TAO_LB_Location_Equal_To,
   TAO_SYNCH_MUTEX> TAO_LB_Location_Map;
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Minimum_Dispersion.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Minimum_Dispersion.cpp
index 27e1b605df7..6c774880b2c 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Minimum_Dispersion.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Minimum_Dispersion.cpp
@@ -1,6 +1,7 @@
 // -*- C++ -*-
 
 #include "LB_Minimum_Dispersion.h"
+#include "LB_Location_Map.h"
 #include "LB_ObjectGroup_Map.h"
 //#include "ReplicaProxy.h"
 
@@ -51,7 +52,7 @@ TAO_LB_Minimum_Dispersion_Strategy::replica (
 
           // @@ Hardcode one load and don't bother checking the
           // LoadId, for now.  (just to get things going)
-          if (d[CORBA::ULong (0)].value > load[CORBA::ULong (0)].value)
+          if ((*d)[CORBA::ULong (0)].value > (*load)[CORBA::ULong (0)].value)
             {
               replica_info = *i;
               d = (*i)->location_entry->load_list.ptr ();
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroupManager.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroupManager.h
index d523a05313e..3a8531b7584 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroupManager.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroupManager.h
@@ -22,9 +22,10 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "LB_Location_Map.h"
+
 
 /// Forward declarations.
-class TAO_LB_Location_Map;
 class TAO_LB_ObjectGroup_Map;
 class TAO_LB_PropertyManager;
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_PropertyManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_PropertyManager.cpp
index a33bf726d22..5bdf9d4daf1 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_PropertyManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_PropertyManager.cpp
@@ -121,7 +121,7 @@ TAO_LB_PropertyManager::set_properties_dynamically (
   this->validate_properties (overrides, ACE_TRY_ENV);
   ACE_CHECK;
 
-  ACE_THROW (CORBA::NO_IMPLEMENT ());  
+  ACE_THROW (CORBA::NO_IMPLEMENT ());
 }
 
 LoadBalancing::Properties *
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.h
index fc6d1507465..e68a2d049a6 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.h
@@ -25,10 +25,7 @@
 #include "orbsvcs/LoadBalancingC.h"
 
 #include "LB_ReplicaInfo.h"
-
-
-// Forward declarations.
-class TAO_LB_Location_Map;
+#include "LB_Location_Map.h"
 
 
 /**
@@ -48,7 +45,6 @@ public:
   TAO_LB_Pull_Handler (TAO_LB_Location_Map &location_map);
 
   /// Receive the timeout event.
-    /
   virtual int handle_timeout (const ACE_Time_Value &current_time,
                               const void *arg);
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ReplicaInfo.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ReplicaInfo.h
index fc4578ca6ac..897b5b8f2e0 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ReplicaInfo.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ReplicaInfo.h
@@ -25,6 +25,9 @@
 
 #include "orbsvcs/LoadBalancingC.h"
 
+// Forward declarations.
+struct TAO_LB_Location_Map_Entry;
+
 class TAO_LB_ReplicaInfo;
 typedef ACE_Unbounded_Set<TAO_LB_ReplicaInfo *> TAO_LB_ReplicaInfo_Set;
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancingI.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancingI.cpp
index 066e4bbebfe..738b1bf7dc6 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancingI.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancingI.cpp
@@ -9,6 +9,9 @@
 
 #include "LB_Minimum_Dispersion.h"  // @@ REMOVE ME!
 
+#include "tao/ORB_Core.h"
+#include "ace/Auto_Ptr.h"
+
 ACE_RCSID (LoadBalancing,
            LoadBalancingI,
            "$Id$")
@@ -20,7 +23,7 @@ TAO_LoadBalancing_ReplicationManager_i::TAO_LoadBalancing_ReplicationManager_i
   : orb_ (),
     poa_ (),
     lock_ (),
-    location_map_
+    location_map_ (),
     object_group_map_ (),
     property_manager_ (this->object_group_map_),
     generic_factory_ (this->location_map_,
@@ -29,9 +32,10 @@ TAO_LoadBalancing_ReplicationManager_i::TAO_LoadBalancing_ReplicationManager_i
     object_group_manager_ (this->location_map_,
                            this->object_group_map_,
                            this->property_manager_),
-    balancing_strategy_ (new TAO_LB_Minimum_Dispersion_Strategy) //@@ FIXME!
+   balancing_strategy_ (new TAO_LB_Minimum_Dispersion_Strategy),
+   pull_handler_ (this->location_map_)
 {
-  //  (void) this->init ();  
+  //  (void) this->init ();
 }
 
 // Implementation skeleton destructor
@@ -72,12 +76,13 @@ TAO_LoadBalancing_ReplicationManager_i::register_load_monitor (
 
   int result = this->location_map_.find (the_location,
                                          location_entry);
-  
+
   // If no location entry exists for the given location, then create
   // and bind a new one.
   if (result != 0)
     {
       ACE_NEW_THROW_EX (location_entry,
+                        TAO_LB_Location_Map_Entry,
                         CORBA::NO_MEMORY (
                           CORBA::SystemException::_tao_minor_code (
                             TAO_DEFAULT_MINOR_CODE,
@@ -85,14 +90,16 @@ TAO_LoadBalancing_ReplicationManager_i::register_load_monitor (
                           CORBA::COMPLETED_NO));
       ACE_CHECK;
 
-      safe_location_entry = location_entry;
+      ACE_AUTO_PTR_RESET (safe_location_entry,
+                          location_entry,
+                          TAO_LB_Location_Map_Entry);
 
       if (this->location_map_.bind (the_location,
                                     location_entry) != 0)
         ACE_THROW (CORBA::INTERNAL ());  // @@ Pick a better (user?)
                                          //    exception.
     }
-  else if (CORBA::is_nil (location_entry->load_monitor))
+  else if (CORBA::is_nil (location_entry->load_monitor.in ()))
     {
       location_entry->load_monitor =
         LoadBalancing::LoadMonitor::_duplicate (load_monitor);
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancingI.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancingI.h
index edf69749b89..ade067ae4e8 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancingI.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancingI.h
@@ -24,10 +24,12 @@
 
 #include "orbsvcs/LoadBalancingS.h"
 
+#include "LB_Location_Map.h"
 #include "LB_ObjectGroup_Map.h"
 #include "LB_PropertyManager.h"
 #include "LB_GenericFactory.h"
 #include "LB_ObjectGroupManager.h"
+#include "LB_Pull_Handler.h"
 
 
 /// Forward declarations
@@ -300,7 +302,8 @@ public:
   /// Initialize the load balancer.  This will cause a child POA to be
   /// created with the appropriate policies to support ServantLocators
   /// (i.e. for the ReplicaLocator).
-  void init (PortableServer::POA_ptr root_poa,
+  void init (CORBA::ORB_ptr orb,
+             PortableServer::POA_ptr root_poa,
              CORBA::Environment &ACE_TRY_ENV);
 
 private:
@@ -359,6 +362,10 @@ private:
   /// decisions.
   TAO_LB_Balancing_Strategy *balancing_strategy_;
 
+  /// The event handler that performs "pull monitoring" on all
+  /// registered load monitors.
+  TAO_LB_Pull_Handler pull_handler_;
+
 };
 
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancingI.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancingI.cpp
index 066e4bbebfe..738b1bf7dc6 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancingI.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancingI.cpp
@@ -9,6 +9,9 @@
 
 #include "LB_Minimum_Dispersion.h"  // @@ REMOVE ME!
 
+#include "tao/ORB_Core.h"
+#include "ace/Auto_Ptr.h"
+
 ACE_RCSID (LoadBalancing,
            LoadBalancingI,
            "$Id$")
@@ -20,7 +23,7 @@ TAO_LoadBalancing_ReplicationManager_i::TAO_LoadBalancing_ReplicationManager_i
   : orb_ (),
     poa_ (),
     lock_ (),
-    location_map_
+    location_map_ (),
     object_group_map_ (),
     property_manager_ (this->object_group_map_),
     generic_factory_ (this->location_map_,
@@ -29,9 +32,10 @@ TAO_LoadBalancing_ReplicationManager_i::TAO_LoadBalancing_ReplicationManager_i
     object_group_manager_ (this->location_map_,
                            this->object_group_map_,
                            this->property_manager_),
-    balancing_strategy_ (new TAO_LB_Minimum_Dispersion_Strategy) //@@ FIXME!
+   balancing_strategy_ (new TAO_LB_Minimum_Dispersion_Strategy),
+   pull_handler_ (this->location_map_)
 {
-  //  (void) this->init ();  
+  //  (void) this->init ();
 }
 
 // Implementation skeleton destructor
@@ -72,12 +76,13 @@ TAO_LoadBalancing_ReplicationManager_i::register_load_monitor (
 
   int result = this->location_map_.find (the_location,
                                          location_entry);
-  
+
   // If no location entry exists for the given location, then create
   // and bind a new one.
   if (result != 0)
     {
       ACE_NEW_THROW_EX (location_entry,
+                        TAO_LB_Location_Map_Entry,
                         CORBA::NO_MEMORY (
                           CORBA::SystemException::_tao_minor_code (
                             TAO_DEFAULT_MINOR_CODE,
@@ -85,14 +90,16 @@ TAO_LoadBalancing_ReplicationManager_i::register_load_monitor (
                           CORBA::COMPLETED_NO));
       ACE_CHECK;
 
-      safe_location_entry = location_entry;
+      ACE_AUTO_PTR_RESET (safe_location_entry,
+                          location_entry,
+                          TAO_LB_Location_Map_Entry);
 
       if (this->location_map_.bind (the_location,
                                     location_entry) != 0)
         ACE_THROW (CORBA::INTERNAL ());  // @@ Pick a better (user?)
                                          //    exception.
     }
-  else if (CORBA::is_nil (location_entry->load_monitor))
+  else if (CORBA::is_nil (location_entry->load_monitor.in ()))
     {
       location_entry->load_monitor =
         LoadBalancing::LoadMonitor::_duplicate (load_monitor);
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancingI.h b/TAO/orbsvcs/orbsvcs/LoadBalancingI.h
index edf69749b89..ade067ae4e8 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancingI.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancingI.h
@@ -24,10 +24,12 @@
 
 #include "orbsvcs/LoadBalancingS.h"
 
+#include "LB_Location_Map.h"
 #include "LB_ObjectGroup_Map.h"
 #include "LB_PropertyManager.h"
 #include "LB_GenericFactory.h"
 #include "LB_ObjectGroupManager.h"
+#include "LB_Pull_Handler.h"
 
 
 /// Forward declarations
@@ -300,7 +302,8 @@ public:
   /// Initialize the load balancer.  This will cause a child POA to be
   /// created with the appropriate policies to support ServantLocators
   /// (i.e. for the ReplicaLocator).
-  void init (PortableServer::POA_ptr root_poa,
+  void init (CORBA::ORB_ptr orb,
+             PortableServer::POA_ptr root_poa,
              CORBA::Environment &ACE_TRY_ENV);
 
 private:
@@ -359,6 +362,10 @@ private:
   /// decisions.
   TAO_LB_Balancing_Strategy *balancing_strategy_;
 
+  /// The event handler that performs "pull monitoring" on all
+  /// registered load monitors.
+  TAO_LB_Pull_Handler pull_handler_;
+
 };
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.LoadBalancing b/TAO/orbsvcs/orbsvcs/Makefile.LoadBalancing
index 4c45988c39a..71169ac55e1 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.LoadBalancing
+++ b/TAO/orbsvcs/orbsvcs/Makefile.LoadBalancing
@@ -521,7 +521,7 @@ realclean: clean
  Naming/naming_export.h \
  CosNamingC.i \
  LoadBalancingC.i \
- LoadBalancing/LB_ObjectGroup_Map.h \
+ LoadBalancing/LB_Location_Map.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -549,6 +549,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ LoadBalancing/LB_ReplicaInfo.h LoadBalancing/LB_Location_Hash.h \
+ LoadBalancing/LB_Location_Hash.inl \
+ LoadBalancing/LB_Location_Equal_To.h \
+ LoadBalancing/LB_Location_Equal_To.inl \
+ LoadBalancing/LB_ObjectGroup_Map.h \
  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \
  $(ACE_ROOT)/ace/Map.h \
  $(ACE_ROOT)/ace/Map_T.h \
@@ -568,7 +573,8 @@ realclean: clean
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \
- LoadBalancing/LB_ReplicaInfo.h LoadBalancing/LB_PropertyManager.h \
+ LoadBalancing/LB_ObjectGroup_Map.inl \
+ LoadBalancing/LB_PropertyManager.h \
  $(ACE_ROOT)/ace/Auto_Ptr.h \
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp
@@ -1442,7 +1448,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
- LoadBalancing/LB_ObjectGroup_Map.h \
+ LoadBalancing/LB_Location_Map.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -1470,6 +1476,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ LoadBalancing/LB_ReplicaInfo.h LoadBalancing/LB_Location_Hash.h \
+ LoadBalancing/LB_Location_Hash.inl \
+ LoadBalancing/LB_Location_Equal_To.h \
+ LoadBalancing/LB_Location_Equal_To.inl \
+ LoadBalancing/LB_ObjectGroup_Map.h \
  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \
  $(ACE_ROOT)/ace/Map.h \
  $(ACE_ROOT)/ace/Map_T.h \
@@ -1489,7 +1500,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \
- LoadBalancing/LB_ReplicaInfo.h
+ LoadBalancing/LB_ObjectGroup_Map.inl
 
 .obj/LB_ObjectGroupManager.o .obj/LB_ObjectGroupManager.so .shobj/LB_ObjectGroupManager.o .shobj/LB_ObjectGroupManager.so: LoadBalancing/LB_ObjectGroupManager.cpp \
  LoadBalancing/LB_ObjectGroupManager.h \
@@ -1691,7 +1702,7 @@ realclean: clean
  Naming/naming_export.h \
  CosNamingC.i \
  LoadBalancingC.i \
- LoadBalancing/LB_ObjectGroup_Map.h \
+ LoadBalancing/LB_Location_Map.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -1719,6 +1730,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ LoadBalancing/LB_ReplicaInfo.h LoadBalancing/LB_Location_Hash.h \
+ LoadBalancing/LB_Location_Hash.inl \
+ LoadBalancing/LB_Location_Equal_To.h \
+ LoadBalancing/LB_Location_Equal_To.inl \
+ LoadBalancing/LB_ObjectGroup_Map.h \
  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \
  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
@@ -1741,10 +1757,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \
- LoadBalancing/LB_ReplicaInfo.h LoadBalancing/LB_Location_Map.h \
- LoadBalancing/LB_Location_Hash.h LoadBalancing/LB_Location_Hash.inl \
- LoadBalancing/LB_Location_Equal_To.h \
- LoadBalancing/LB_Location_Equal_To.inl
+ LoadBalancing/LB_ObjectGroup_Map.inl
 
 .obj/LB_ObjectGroup_Map.o .obj/LB_ObjectGroup_Map.so .shobj/LB_ObjectGroup_Map.o .shobj/LB_ObjectGroup_Map.so: LoadBalancing/LB_ObjectGroup_Map.cpp \
  LoadBalancing/LB_ObjectGroup_Map.h \
@@ -1995,7 +2008,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \
- LoadBalancing/LB_ReplicaInfo.h
+ LoadBalancing/LB_ReplicaInfo.h LoadBalancing/LB_ObjectGroup_Map.inl
 
 .obj/LB_PropertyManager.o .obj/LB_PropertyManager.so .shobj/LB_PropertyManager.o .shobj/LB_PropertyManager.so: LoadBalancing/LB_PropertyManager.cpp \
  LoadBalancing/LB_PropertyManager.h \
@@ -2247,7 +2260,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \
- LoadBalancing/LB_ReplicaInfo.h
+ LoadBalancing/LB_ReplicaInfo.h LoadBalancing/LB_ObjectGroup_Map.inl
 
 .obj/LB_RPMS_Monitor.o .obj/LB_RPMS_Monitor.so .shobj/LB_RPMS_Monitor.o .shobj/LB_RPMS_Monitor.so: LoadBalancing/LB_RPMS_Monitor.cpp \
  LoadBalancing/LB_RPMS_Monitor.h \
@@ -3521,7 +3534,7 @@ realclean: clean
  LoadBalancingS_T.i \
  LoadBalancingS_T.cpp \
  LoadBalancingS.i \
- LoadBalancing/LB_ObjectGroup_Map.h \
+ LoadBalancing/LB_Location_Map.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -3549,6 +3562,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ LoadBalancing/LB_ReplicaInfo.h LoadBalancing/LB_Location_Hash.h \
+ LoadBalancing/LB_Location_Hash.inl \
+ LoadBalancing/LB_Location_Equal_To.h \
+ LoadBalancing/LB_Location_Equal_To.inl \
+ LoadBalancing/LB_ObjectGroup_Map.h \
  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \
  $(ACE_ROOT)/ace/Map.h \
  $(ACE_ROOT)/ace/Map_T.h \
@@ -3568,12 +3586,9 @@ realclean: clean
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \
- LoadBalancing/LB_ReplicaInfo.h LoadBalancing/LB_PropertyManager.h \
- LoadBalancing/LB_GenericFactory.h \
- LoadBalancing/LB_ObjectGroupManager.h LoadBalancing/LB_Location_Map.h \
- LoadBalancing/LB_Location_Hash.h LoadBalancing/LB_Location_Hash.inl \
- LoadBalancing/LB_Location_Equal_To.h \
- LoadBalancing/LB_Location_Equal_To.inl
+ LoadBalancing/LB_ObjectGroup_Map.inl \
+ LoadBalancing/LB_PropertyManager.h LoadBalancing/LB_GenericFactory.h \
+ LoadBalancing/LB_ObjectGroupManager.h LoadBalancing/LB_Pull_Handler.h
 
 .obj/LoadBalancingI.o .obj/LoadBalancingI.so .shobj/LoadBalancingI.o .shobj/LoadBalancingI.so: LoadBalancing/LoadBalancingI.cpp \
  LoadBalancing/LoadBalancingI.h \
@@ -3801,7 +3816,7 @@ realclean: clean
  LoadBalancingS_T.i \
  LoadBalancingS_T.cpp \
  LoadBalancingS.i \
- LoadBalancing/LB_ObjectGroup_Map.h \
+ LoadBalancing/LB_Location_Map.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -3829,6 +3844,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ LoadBalancing/LB_ReplicaInfo.h LoadBalancing/LB_Location_Hash.h \
+ LoadBalancing/LB_Location_Hash.inl \
+ LoadBalancing/LB_Location_Equal_To.h \
+ LoadBalancing/LB_Location_Equal_To.inl \
+ LoadBalancing/LB_ObjectGroup_Map.h \
  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \
  $(ACE_ROOT)/ace/Map.h \
  $(ACE_ROOT)/ace/Map_T.h \
@@ -3848,12 +3868,9 @@ realclean: clean
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \
- LoadBalancing/LB_ReplicaInfo.h LoadBalancing/LB_PropertyManager.h \
- LoadBalancing/LB_GenericFactory.h \
- LoadBalancing/LB_ObjectGroupManager.h LoadBalancing/LB_Location_Map.h \
- LoadBalancing/LB_Location_Hash.h LoadBalancing/LB_Location_Hash.inl \
- LoadBalancing/LB_Location_Equal_To.h \
- LoadBalancing/LB_Location_Equal_To.inl \
+ LoadBalancing/LB_ObjectGroup_Map.inl \
+ LoadBalancing/LB_PropertyManager.h LoadBalancing/LB_GenericFactory.h \
+ LoadBalancing/LB_ObjectGroupManager.h LoadBalancing/LB_Pull_Handler.h \
  LoadBalancing/LB_ReplicaLocator.h \
  LoadBalancing/LB_Balancing_Strategy.h \
  LoadBalancing/LoadBalancing_export.h \
@@ -3862,7 +3879,48 @@ realclean: clean
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.i \
+ $(TAO_ROOT)/tao/Service_Callbacks.h \
+ $(TAO_ROOT)/tao/Service_Callbacks.i \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+ $(TAO_ROOT)/tao/Cache_Entries.h \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Endpoint.h \
+ $(TAO_ROOT)/tao/Endpoint.i \
+ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Cache_Entries.inl \
+ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+ $(TAO_ROOT)/tao/Object_Ref_Table.h \
+ $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RT_Policy_i.i \
+ $(TAO_ROOT)/tao/Protocols_Hooks.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.cpp
 
 .obj/LoadBalancingS.o .obj/LoadBalancingS.so .shobj/LoadBalancingS.o .shobj/LoadBalancingS.so: LoadBalancingS.cpp LoadBalancingS.h \
  $(ACE_ROOT)/ace/pre.h \