*** empty log message ***

13 files changed, 83 insertions, 72 deletions

diff --git a/TAO/orbsvcs/orbsvcs/LB_Balancing_Strategy.cpp b/TAO/orbsvcs/orbsvcs/LB_Balancing_Strategy.cpp
index d891a23ca2c..eca536d8715 100644
--- a/TAO/orbsvcs/orbsvcs/LB_Balancing_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/LB_Balancing_Strategy.cpp
@@ -7,6 +7,7 @@ ACE_RCSID (orbsvcs,
            LB_Balancing_Strategy,
            "$Id$")
 
+
 TAO_LB_Balancing_Strategy::~TAO_LB_Balancing_Strategy (void)
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/LB_Balancing_Strategy.h b/TAO/orbsvcs/orbsvcs/LB_Balancing_Strategy.h
index b793debee65..c704ecc569b 100644
--- a/TAO/orbsvcs/orbsvcs/LB_Balancing_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/LB_Balancing_Strategy.h
@@ -24,7 +24,7 @@
 # endif /* ACE_LACKS_PRAGMA_ONCE */
 
 // class TAO_LB_ReplicaProxy;
-class TAO_LB_ObjectGroup_Map_Entry;
+struct TAO_LB_ObjectGroup_Map_Entry;
 
 
 /**
@@ -67,9 +67,6 @@ public:
 //                              CORBA::Environment &ACE_TRY_ENV);
 };
 
-#if !defined (__ACE_INLINE__)
-#include "LoadBalancing_Strategy.i"
-#endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/LB_Minimum_Dispersion.h b/TAO/orbsvcs/orbsvcs/LB_Minimum_Dispersion.h
index bb22ff7517a..19a1b50ae33 100644
--- a/TAO/orbsvcs/orbsvcs/LB_Minimum_Dispersion.h
+++ b/TAO/orbsvcs/orbsvcs/LB_Minimum_Dispersion.h
@@ -33,7 +33,7 @@
 
 // Forward declarations
 // class TAO_LB_ReplicaProxy;
-class TAO_LB_ObjectGroup_Map_Entry;
+struct TAO_LB_ObjectGroup_Map_Entry;
 
 // typedef ACE_Unbounded_Set<TAO_LB_ReplicaProxy *> TAO_LB_ReplicaProxySet;
 // typedef ACE_Unbounded_Set_Iterator<TAO_LB_ReplicaProxy *> TAO_LB_ReplicaProxySetIterator;
diff --git a/TAO/orbsvcs/orbsvcs/LB_ReplicaInfo.h b/TAO/orbsvcs/orbsvcs/LB_ReplicaInfo.h
index 897b5b8f2e0..b95d8312a20 100644
--- a/TAO/orbsvcs/orbsvcs/LB_ReplicaInfo.h
+++ b/TAO/orbsvcs/orbsvcs/LB_ReplicaInfo.h
@@ -25,10 +25,10 @@
 
 #include "orbsvcs/LoadBalancingC.h"
 
-// Forward declarations.
+// Fosrward declarations.
 struct TAO_LB_Location_Map_Entry;
 
-class TAO_LB_ReplicaInfo;
+struct TAO_LB_ReplicaInfo;
 typedef ACE_Unbounded_Set<TAO_LB_ReplicaInfo *> TAO_LB_ReplicaInfo_Set;
 
 /**
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing.dsp b/TAO/orbsvcs/orbsvcs/LoadBalancing.dsp
index 743a8db48cb..10c05dc22f5 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing.dsp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing.dsp
@@ -56,7 +56,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386

-# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_LoadBalancing.dll" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_CosNaming.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_LoadBalancing.dll" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

 

 !ELSEIF  "$(CFG)" == "LoadBalancing - Win32 Debug"

 

@@ -83,7 +83,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 TAOd.lib aced.lib TAO_PortableServerd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_LoadBalancingd.dll" /pdbtype:sept /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+# ADD LINK32 TAOd.lib aced.lib TAO_PortableServerd.lib TAO_CosNamingd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_LoadBalancingd.dll" /pdbtype:sept /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

 # SUBTRACT LINK32 /profile

 

 !ELSEIF  "$(CFG)" == "LoadBalancing - Win32 MFC Debug"

@@ -112,7 +112,7 @@ BSC32=bscmake.exe
 LINK32=link.exe

 # ADD BASE LINK32 TAOd.lib aced.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_LoadBalancingd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"

 # SUBTRACT BASE LINK32 /profile

-# ADD LINK32 TAOd.lib aced.lib TAO_PortableServermfcd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_LoadBalancingmfcd.dll" /pdbtype:sept /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+# ADD LINK32 TAOd.lib aced.lib TAO_PortableServermfcd.lib TAO_CosNamingmfcd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_LoadBalancingmfcd.dll" /pdbtype:sept /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

 # SUBTRACT LINK32 /profile

 

 !ELSEIF  "$(CFG)" == "LoadBalancing - Win32 MFC Release"

@@ -140,7 +140,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 ace.lib TAO.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_LoadBalancing.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

-# ADD LINK32 ace.lib TAO.lib TAO_PortableServermfc.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_LoadBalancingmfc.dll" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+# ADD LINK32 ace.lib TAO.lib TAO_PortableServermfc.lib TAO_CosNamingmfc.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_LoadBalancingmfc.dll" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

 

 !ENDIF 

 

@@ -207,10 +207,6 @@ SOURCE=.\LoadBalancing\LB_ReplicaLocator.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\LoadBalancing\LB_Round_Robin_Strategy.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\LoadBalancing\LB_RPMS_Monitor.cpp

 # End Source File

 # Begin Source File

@@ -223,8 +219,16 @@ SOURCE=.\LoadBalancing\LB_RPMS_Monitor_ORBInitializer.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\LoadBalancingC.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\LoadBalancing\LoadBalancingI.cpp

 # End Source File

+# Begin Source File

+

+SOURCE=.\LoadBalancingS.cpp

+# End Source File

 # End Group

 # Begin Group "Header Files"

 

@@ -283,10 +287,6 @@ SOURCE=.\LoadBalancing\LB_ReplicaLocator.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\LoadBalancing\LB_Round_Robin_Strategy.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\LoadBalancing\LB_RPMS_Monitor.h

 # End Source File

 # Begin Source File

@@ -303,8 +303,20 @@ SOURCE=.\LoadBalancing\LoadBalancing_export.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\LoadBalancingC.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\LoadBalancing\LoadBalancingI.h

 # End Source File

+# Begin Source File

+

+SOURCE=.\LoadBalancingS.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\LoadBalancingS_T.h

+# End Source File

 # End Group

 # Begin Group "IDL Files"

 

@@ -424,6 +436,18 @@ SOURCE=.\LoadBalancing\LB_ObjectGroup_Map.inl
 

 SOURCE=.\LoadBalancing\LB_RPMS_Monitor_Interceptor.inl

 # End Source File

+# Begin Source File

+

+SOURCE=.\LoadBalancingC.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\LoadBalancingS.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\LoadBalancingS_T.i

+# End Source File

 # End Group

 # Begin Group "Template Files"

 

diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Balancing_Strategy.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Balancing_Strategy.cpp
index d891a23ca2c..eca536d8715 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Balancing_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Balancing_Strategy.cpp
@@ -7,6 +7,7 @@ ACE_RCSID (orbsvcs,
            LB_Balancing_Strategy,
            "$Id$")
 
+
 TAO_LB_Balancing_Strategy::~TAO_LB_Balancing_Strategy (void)
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Balancing_Strategy.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Balancing_Strategy.h
index b793debee65..c704ecc569b 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Balancing_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Balancing_Strategy.h
@@ -24,7 +24,7 @@
 # endif /* ACE_LACKS_PRAGMA_ONCE */
 
 // class TAO_LB_ReplicaProxy;
-class TAO_LB_ObjectGroup_Map_Entry;
+struct TAO_LB_ObjectGroup_Map_Entry;
 
 
 /**
@@ -67,9 +67,6 @@ public:
 //                              CORBA::Environment &ACE_TRY_ENV);
 };
 
-#if !defined (__ACE_INLINE__)
-#include "LoadBalancing_Strategy.i"
-#endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Minimum_Dispersion.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Minimum_Dispersion.h
index bb22ff7517a..19a1b50ae33 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Minimum_Dispersion.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Minimum_Dispersion.h
@@ -33,7 +33,7 @@
 
 // Forward declarations
 // class TAO_LB_ReplicaProxy;
-class TAO_LB_ObjectGroup_Map_Entry;
+struct TAO_LB_ObjectGroup_Map_Entry;
 
 // typedef ACE_Unbounded_Set<TAO_LB_ReplicaProxy *> TAO_LB_ReplicaProxySet;
 // typedef ACE_Unbounded_Set_Iterator<TAO_LB_ReplicaProxy *> TAO_LB_ReplicaProxySetIterator;
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp
index 469223613f8..5f459ed8ef9 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp
@@ -2,6 +2,8 @@
 
 #include "LB_Pull_Handler.h"
 
+#include "tao/debug.h"
+
 ACE_RCSID (LoadBalancing,
            LB_Pull_Handler,
            "$Id$")
@@ -20,7 +22,7 @@ TAO_LB_Pull_Handler::handle_timeout (
   TAO_LB_Location_Map::iterator begin =
     this->location_map_.begin ();
 
-  TAO_LB_Location_Map::iterator begin =
+  TAO_LB_Location_Map::iterator end =
     this->location_map_.end ();
 
   // Iterate over all registered load monitors.
@@ -31,7 +33,7 @@ TAO_LB_Pull_Handler::handle_timeout (
        i != end;
        ++i)
     {
-      TAO_LB_Location_Map_Entry *location = i->ext_id_;
+      TAO_LB_Location_Map_Entry *location = (*i).int_id_;
 
       ACE_DECLARE_NEW_CORBA_ENV;
       ACE_TRY
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ReplicaInfo.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ReplicaInfo.h
index 897b5b8f2e0..b95d8312a20 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ReplicaInfo.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ReplicaInfo.h
@@ -25,10 +25,10 @@
 
 #include "orbsvcs/LoadBalancingC.h"
 
-// Forward declarations.
+// Fosrward declarations.
 struct TAO_LB_Location_Map_Entry;
 
-class TAO_LB_ReplicaInfo;
+struct 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 738b1bf7dc6..e0e721eec31 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancingI.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancingI.cpp
@@ -154,7 +154,7 @@ TAO_LoadBalancing_ReplicationManager_i::remove_load_monitor (
 
   if (this->location_map_.find (the_location,
                                 location_entry) != 0)
-    ACE_THROW (LoadBalancing::LocationNotFound);
+    ACE_THROW (LoadBalancing::LocationNotFound ());
 
   (void) location_entry->load_monitor.out ();
 
@@ -175,9 +175,8 @@ TAO_LoadBalancing_ReplicationManager_i::set_default_properties (
                    LoadBalancing::InvalidProperty,
                    LoadBalancing::UnsupportedProperty))
 {
-  return
-    this->property_manager_.set_default_properties (props,
-                                                    ACE_TRY_ENV);
+  this->property_manager_.set_default_properties (props,
+                                                  ACE_TRY_ENV);
 }
 
 LoadBalancing::Properties *
@@ -197,9 +196,8 @@ TAO_LoadBalancing_ReplicationManager_i::remove_default_properties (
                    LoadBalancing::InvalidProperty,
                    LoadBalancing::UnsupportedProperty))
 {
-  return
-    this->property_manager_.remove_default_properties (props,
-                                                       ACE_TRY_ENV);
+  this->property_manager_.remove_default_properties (props,
+                                                     ACE_TRY_ENV);
 }
 
 void
@@ -211,10 +209,9 @@ TAO_LoadBalancing_ReplicationManager_i::set_type_properties (
                    LoadBalancing::InvalidProperty,
                    LoadBalancing::UnsupportedProperty))
 {
-  return
-    this->property_manager_.set_type_properties (type_id,
-                                                 overrides,
-                                                 ACE_TRY_ENV);
+  this->property_manager_.set_type_properties (type_id,
+                                               overrides,
+                                               ACE_TRY_ENV);
 }
 
 LoadBalancing::Properties *
@@ -237,10 +234,9 @@ TAO_LoadBalancing_ReplicationManager_i::remove_type_properties (
                    LoadBalancing::InvalidProperty,
                    LoadBalancing::UnsupportedProperty))
 {
-  return
-    this->property_manager_.remove_type_properties (type_id,
-                                                    props,
-                                                    ACE_TRY_ENV);
+  this->property_manager_.remove_type_properties (type_id,
+                                                  props,
+                                                  ACE_TRY_ENV);
 }
 
 void
@@ -253,10 +249,9 @@ TAO_LoadBalancing_ReplicationManager_i::set_properties_dynamically (
                    LoadBalancing::InvalidProperty,
                    LoadBalancing::UnsupportedProperty))
 {
-  return
-    this->property_manager_.set_properties_dynamically (object_group,
-                                                        overrides,
-                                                        ACE_TRY_ENV);
+  this->property_manager_.set_properties_dynamically (object_group,
+                                                      overrides,
+                                                      ACE_TRY_ENV);
 }
 
 LoadBalancing::Properties *
@@ -463,9 +458,8 @@ TAO_LoadBalancing_ReplicationManager_i::delete_object (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    LoadBalancing::ObjectNotFound))
 {
-  return
-    this->generic_factory_.delete_object (factory_creation_id,
-                                          ACE_TRY_ENV);
+  this->generic_factory_.delete_object (factory_creation_id,
+                                        ACE_TRY_ENV);
 }
 
 CORBA::Object_ptr
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancingI.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancingI.cpp
index 738b1bf7dc6..e0e721eec31 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancingI.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancingI.cpp
@@ -154,7 +154,7 @@ TAO_LoadBalancing_ReplicationManager_i::remove_load_monitor (
 
   if (this->location_map_.find (the_location,
                                 location_entry) != 0)
-    ACE_THROW (LoadBalancing::LocationNotFound);
+    ACE_THROW (LoadBalancing::LocationNotFound ());
 
   (void) location_entry->load_monitor.out ();
 
@@ -175,9 +175,8 @@ TAO_LoadBalancing_ReplicationManager_i::set_default_properties (
                    LoadBalancing::InvalidProperty,
                    LoadBalancing::UnsupportedProperty))
 {
-  return
-    this->property_manager_.set_default_properties (props,
-                                                    ACE_TRY_ENV);
+  this->property_manager_.set_default_properties (props,
+                                                  ACE_TRY_ENV);
 }
 
 LoadBalancing::Properties *
@@ -197,9 +196,8 @@ TAO_LoadBalancing_ReplicationManager_i::remove_default_properties (
                    LoadBalancing::InvalidProperty,
                    LoadBalancing::UnsupportedProperty))
 {
-  return
-    this->property_manager_.remove_default_properties (props,
-                                                       ACE_TRY_ENV);
+  this->property_manager_.remove_default_properties (props,
+                                                     ACE_TRY_ENV);
 }
 
 void
@@ -211,10 +209,9 @@ TAO_LoadBalancing_ReplicationManager_i::set_type_properties (
                    LoadBalancing::InvalidProperty,
                    LoadBalancing::UnsupportedProperty))
 {
-  return
-    this->property_manager_.set_type_properties (type_id,
-                                                 overrides,
-                                                 ACE_TRY_ENV);
+  this->property_manager_.set_type_properties (type_id,
+                                               overrides,
+                                               ACE_TRY_ENV);
 }
 
 LoadBalancing::Properties *
@@ -237,10 +234,9 @@ TAO_LoadBalancing_ReplicationManager_i::remove_type_properties (
                    LoadBalancing::InvalidProperty,
                    LoadBalancing::UnsupportedProperty))
 {
-  return
-    this->property_manager_.remove_type_properties (type_id,
-                                                    props,
-                                                    ACE_TRY_ENV);
+  this->property_manager_.remove_type_properties (type_id,
+                                                  props,
+                                                  ACE_TRY_ENV);
 }
 
 void
@@ -253,10 +249,9 @@ TAO_LoadBalancing_ReplicationManager_i::set_properties_dynamically (
                    LoadBalancing::InvalidProperty,
                    LoadBalancing::UnsupportedProperty))
 {
-  return
-    this->property_manager_.set_properties_dynamically (object_group,
-                                                        overrides,
-                                                        ACE_TRY_ENV);
+  this->property_manager_.set_properties_dynamically (object_group,
+                                                      overrides,
+                                                      ACE_TRY_ENV);
 }
 
 LoadBalancing::Properties *
@@ -463,9 +458,8 @@ TAO_LoadBalancing_ReplicationManager_i::delete_object (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    LoadBalancing::ObjectNotFound))
 {
-  return
-    this->generic_factory_.delete_object (factory_creation_id,
-                                          ACE_TRY_ENV);
+  this->generic_factory_.delete_object (factory_creation_id,
+                                        ACE_TRY_ENV);
 }
 
 CORBA::Object_ptr
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.LoadBalancing b/TAO/orbsvcs/orbsvcs/Makefile.LoadBalancing
index 71169ac55e1..6c547005eeb 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.LoadBalancing
+++ b/TAO/orbsvcs/orbsvcs/Makefile.LoadBalancing
@@ -46,6 +46,7 @@ CPP_SRCS += \
   LoadBalancing/LB_ObjectGroupManager \
   LoadBalancing/LB_ObjectGroup_Map \
   LoadBalancing/LB_PropertyManager \
+  LoadBalancing/LB_Pull_Handler \
   LoadBalancing/LB_RPMS_Monitor \
   LoadBalancing/LB_RPMS_Monitor_Interceptor \
   LoadBalancing/LB_RPMS_Monitor_ORBInitializer \