*** empty log message ***

5 files changed, 76 insertions, 70 deletions

diff --git a/TAO/orbsvcs/LoadBalancer/Makefile b/TAO/orbsvcs/LoadBalancer/Makefile
index 67c55c73b2a..b625c644073 100644
--- a/TAO/orbsvcs/LoadBalancer/Makefile
+++ b/TAO/orbsvcs/LoadBalancer/Makefile
@@ -276,7 +276,7 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)
  $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroup_Map.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Map.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -304,6 +304,12 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LB_ReplicaInfo.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Hash.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Hash.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Equal_To.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Equal_To.inl \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroup_Map.h \
  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \
  $(ACE_ROOT)/ace/Map.h \
  $(ACE_ROOT)/ace/Map_T.h \
@@ -323,15 +329,11 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LB_ReplicaInfo.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroup_Map.inl \
  $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LB_PropertyManager.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LB_GenericFactory.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroupManager.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Map.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Hash.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Hash.inl \
- $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Equal_To.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Equal_To.inl
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.h
 
 .obj/LoadBalancer_Service.o .obj/LoadBalancer_Service.so .shobj/LoadBalancer_Service.o .shobj/LoadBalancer_Service.so: LoadBalancer_Service.cpp LoadBalancer.h \
  $(TAO_ROOT)/tao/ORB.h \
diff --git a/TAO/orbsvcs/orbsvcs/LB_Location_Map.cpp b/TAO/orbsvcs/orbsvcs/LB_Location_Map.cpp
index f2033761317..8787bc9a0ff 100644
--- a/TAO/orbsvcs/orbsvcs/LB_Location_Map.cpp
+++ b/TAO/orbsvcs/orbsvcs/LB_Location_Map.cpp
@@ -9,7 +9,7 @@ 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_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>;
@@ -17,7 +17,7 @@ template class ACE_Hash_Map_Reverse_Iterator_Ex<LoadBalancing::Location, TAO_LB_
 
 #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_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>
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Map.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Map.cpp
index f2033761317..8787bc9a0ff 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Map.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Map.cpp
@@ -9,7 +9,7 @@ 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_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>;
@@ -17,7 +17,7 @@ template class ACE_Hash_Map_Reverse_Iterator_Ex<LoadBalancing::Location, TAO_LB_
 
 #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_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>
diff --git a/TAO/orbsvcs/tests/LoadBalancing/Makefile b/TAO/orbsvcs/tests/LoadBalancing/Makefile
index 41ba7863c2f..0fc8a475d53 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/Makefile
+++ b/TAO/orbsvcs/tests/LoadBalancing/Makefile
@@ -312,20 +312,23 @@ realclean: clean
  $(ACE_ROOT)/ace/Sock_Connect.i \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Get_Opt.i \
- HasherFactory.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LB_RPMS_Monitor.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS.h \
+ $(TAO_ROOT)/tao/PortableInterceptorS.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/Synch.i \
  $(ACE_ROOT)/ace/Synch_T.h \
@@ -338,65 +341,31 @@ realclean: clean
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Unbounded_Queue.h \
- $(ACE_ROOT)/ace/Node.h \
- $(ACE_ROOT)/ace/Node.cpp \
- $(ACE_ROOT)/ace/Unbounded_Queue.inl \
- $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Unbounded_Set.h \
- $(ACE_ROOT)/ace/Unbounded_Set.inl \
- $(ACE_ROOT)/ace/Unbounded_Set.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
  $(ACE_ROOT)/ace/Malloc_T.i \
  $(ACE_ROOT)/ace/Malloc_T.cpp \
  $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Signal.i \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Unbounded_Set.h \
+ $(ACE_ROOT)/ace/Node.h \
+ $(ACE_ROOT)/ace/Node.cpp \
+ $(ACE_ROOT)/ace/Unbounded_Set.inl \
+ $(ACE_ROOT)/ace/Unbounded_Set.cpp \
  $(ACE_ROOT)/ace/Memory_Pool.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS.h \
- $(TAO_ROOT)/tao/PortableInterceptorS.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.i \
@@ -422,6 +391,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/Any.i \
@@ -469,6 +440,9 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/NVList.h \
+ $(ACE_ROOT)/ace/Unbounded_Queue.h \
+ $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/LocalObject.i \
@@ -522,14 +496,43 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS.i \
- Hasher_i.h HasherS.h HasherC.h HasherC.i HasherS_T.h HasherS_T.i \
- HasherS_T.cpp HasherS.i
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LB_RPMS_Monitor_Interceptor.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LB_Redirect_Table.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LB_RPMS_Monitor_Interceptor.inl \
+ HasherFactory.h Hasher_i.h HasherS.h HasherC.h HasherC.i HasherS_T.h \
+ HasherS_T.i HasherS_T.cpp HasherS.i
 
 .obj/HasherFactory.o .obj/HasherFactory.so .shobj/HasherFactory.o .shobj/HasherFactory.so: HasherFactory.cpp HasherFactory.h \
  $(ACE_ROOT)/ace/pre.h \
@@ -784,7 +787,8 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancingS.i \
  Hasher_i.h HasherS.h HasherC.h HasherC.i HasherS_T.h HasherS_T.i \
- HasherS_T.cpp HasherS.i
+ HasherS_T.cpp HasherS.i \
+ $(TAO_ROOT)/tao/debug.h
 
 .obj/Hasher_i.o .obj/Hasher_i.so .shobj/Hasher_i.o .shobj/Hasher_i.so: Hasher_i.cpp Hasher_i.h HasherS.h HasherC.h \
  $(TAO_ROOT)/tao/corba.h \
diff --git a/TAO/orbsvcs/tests/LoadBalancing/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/server.cpp
index b913a09d8a2..5c159e58a46 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/server.cpp
@@ -76,7 +76,7 @@ setup_lb (CORBA::Object_ptr lb,
                       0);
 
       LoadBalancing::Criteria_var criteria = tmp;
-      
+
       criteria->length (DEFAULT_PROPERTY_COUNT);
 
       // Default initial number of replicas
@@ -253,7 +253,7 @@ main (int argc, char *argv[])
       // Set up the criteria to be used when creating the object
       // group, and activate the hasher factory.
       LoadBalancing::Criteria_var the_criteria =
-        ::setup_lb (lb,
+        ::setup_lb (lb.in (),
                     rpms_monitor,
                     hasher_factory);