ChangeLogTag:Sat Jun 7 14:14:24 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>

author: bala <balanatarajan@users.noreply.github.com> 2003-06-07 19:33:43 +0000
committer: bala <balanatarajan@users.noreply.github.com> 2003-06-07 19:33:43 +0000
commit: 1f2cf094be7353f78c29ddb1dfc75f39f4f8b9ae (patch)
tree: da8e895d6dc7bb944ad491ba6ff6de8ad708fa32
parent: d09b3386036f10ae2279c6c1f0af3a626283b2c4 (diff)
download: ATCD-1f2cf094be7353f78c29ddb1dfc75f39f4f8b9ae.tar.gz
13 files changed, 1454 insertions, 502 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 80305d8d109..ce90efc6bcb 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,65 @@
+Sat Jun  7 14:14:24 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* tao/ORB_Core.h:
+	* tao/ORB_Core.cpp (get_protocol_hooks): This method needed
+	  synchronization that was missing. This method is called from the
+	  the *IOP_Transport::send_request () method. Multiple threads
+	  could be calling the same method from various handlers and there
+	  could be a race during initialization.
+
+	  Since we now have a lock in the get_protocol_hooks () method and
+	  since the method goes to the ACE_Dynamic_Service singleton,
+	  there was need to optimize things a bit. This necessitated a flag
+	  that will keep track whether the get_protocol_hooks () has been
+	  called or not. If called, the method wold be more or like a
+	  no-op. Sad that we cannot inline this method to squeeze things
+	  out a bit more. 
+
+	* tao/Protocols_Hooks.h: Changed the signatures of the methods
+	  update_client_protocol_properties () and
+	  update_server_protocol_properties (). These methods will now use
+	  a transport instead of the connection handler. Please see below
+	  for the actual reason.
+	  
+	* tao/Default_Protocols_Hooks.h:
+	* tao/Default_Protocols_Hooks.cpp: Changes necessitated by the
+	  above change. 
+	
+	* tao/IIOP_Transport.cpp:
+	* tao/IIOP_Transport.h: Added a methoid update_protocol_properties
+	  () which would serve as a bridge for a similar call on the
+	  connection handler. This method holds the transport lock and
+	  checks for the sanity of the connection handler before it calls
+	  update_protocol_properties () on the connection handler. 
+	
+	* tao/Stub.cpp: Removed a call to reset_hint () on the endpoint. 
+
+	* tao/RTCORBA/RT_Protocols_Hooks.cpp
+	* tao/RTCORBA/RT_Protocols_Hooks.h: Changed the signatures of
+	  update_client_protocol_properties () and
+	  update_server_protocol_properties () to be in sync with the
+	  above change. 
+	
+	* tao/RTPortableServer/RT_Servant_Dispatcher.cpp: The nucleus of
+	  the problem was here. The object adapter during the invocation
+	  path makes a call to pre_invoke_remote_request (). Since the
+	  call is on the server side, only the transport object can be
+	  used to do anything since there is a possibility that the
+	  connection handlers could have been deleted. This goes back to
+	  how the TP_Reactor works and how things are implemented in TAO.
+
+	  The transport object is capable of running some consistency
+	  checks on the connection handlers before invoking any method on
+	  the connection handler. We have now restructured the code in
+	  such a manner that the Protocols_Hooks will make a call on the
+	  transport object which will delegate to the connection handler
+	  after a couple of consistency checks. We got rid of a dynamic
+	  cast on the critical path by this restructuring.
+
+	  Thanks to Andrew <andrewv@melbpc.org.au> for reporting the
+	  problem and providing lots of stack traces that pointed out the
+	  source of the problem.
+	
 Sat Jun  7 13:45:38 2003  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
 
 	* tao/PortableServer/Operation_Table.cpp: 
diff --git a/TAO/tao/Default_Protocols_Hooks.cpp b/TAO/tao/Default_Protocols_Hooks.cpp
index c57d7328772..1be7df9586e 100644
--- a/TAO/tao/Default_Protocols_Hooks.cpp
+++ b/TAO/tao/Default_Protocols_Hooks.cpp
@@ -5,7 +5,7 @@
 #include "Default_Protocols_Hooks.h"
 #include "PolicyC.h"
 #include "ace/Dynamic_Service.h"
-#include "tao/Connection_Handler.h"
+
 
 #if !defined (__ACE_INLINE__)
 # include "Default_Protocols_Hooks.i"
@@ -31,7 +31,7 @@ int
 TAO_Default_Protocols_Hooks::call_client_protocols_hook (int &,
                                                          int &,
                                                          int &,
-							 int &,
+                                                         int &,
                                                          const char *)
 {
   return 0;
@@ -41,7 +41,7 @@ int
 TAO_Default_Protocols_Hooks::call_server_protocols_hook (int &,
                                                          int &,
                                                          int &,
-							 int &,
+                                                         int &,
                                                          const char *)
 {
   return 0;
@@ -128,23 +128,23 @@ TAO_Default_Protocols_Hooks::rt_service_context (TAO_Stub *,
 {
 }
 
-int 
+int
 TAO_Default_Protocols_Hooks::update_client_protocol_properties (TAO_Stub *,
-								       TAO_Connection_Handler *,
-								       const char *)
+                                                                TAO_Transport *,
+                                                                const char *)
 {
   return 0;
 }
-  
-int 
+
+int
 TAO_Default_Protocols_Hooks::update_server_protocol_properties (CORBA::Policy *,
-								TAO_Connection_Handler *,
-								const char *)
+                                                                TAO_Transport *,
+                                                                const char *)
 {
   return 0;
 }
 
-CORBA::Long 
+CORBA::Long
 TAO_Default_Protocols_Hooks::get_dscp_codepoint (void)
 {
   return 0;
diff --git a/TAO/tao/Default_Protocols_Hooks.h b/TAO/tao/Default_Protocols_Hooks.h
index 5e82fee6d79..5c94886d776 100644
--- a/TAO/tao/Default_Protocols_Hooks.h
+++ b/TAO/tao/Default_Protocols_Hooks.h
@@ -40,25 +40,25 @@ public:
   virtual int call_client_protocols_hook (int &send_buffer_size,
                                           int &recv_buffer_size,
                                           int &no_delay,
-					  int &enable_network_priority,
+                                          int &enable_network_priority,
                                           const char *protocol_type);
 
   virtual int call_server_protocols_hook (int &send_buffer_size,
                                           int &recv_buffer_size,
                                           int &no_delay,
-					  int &enable_network_priority,
+                                          int &enable_network_priority,
                                           const char *protocol_type);
 
   virtual int update_client_protocol_properties (TAO_Stub *stub,
-							TAO_Connection_Handler *connection_handler,
-							const char *protocol_type);
-  
+                                                 TAO_Transport *t,
+                                                 const char *protocol_type);
+
   virtual int update_server_protocol_properties (CORBA::Policy *policy,
-							TAO_Connection_Handler *connection_handler,
-							const char *protocol_type);
-  
+                                                 TAO_Transport *t,
+                                                 const char *protocol_type);
+
   virtual CORBA::Long get_dscp_codepoint (void);
-  
+
   virtual void rt_service_context (TAO_Stub *stub,
                                    TAO_Service_Context &service_context,
                                    CORBA::Boolean restart
diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp
index 69a1f2acab9..716ec4f1cde 100644
--- a/TAO/tao/IIOP_Transport.cpp
+++ b/TAO/tao/IIOP_Transport.cpp
@@ -179,19 +179,10 @@ TAO_IIOP_Transport::send_request (TAO_Stub *stub,
 
       if (tph != 0)
         {
-          ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->handler_lock_, -1);
-
-          if (this->check_event_handler_i ("IIOP_Transport::send_request")
-              == -1)
-            return -1;
-
-          const char protocol[] = "iiop";
-          const char * protocol_type = protocol;
-
           int result =
             tph->update_client_protocol_properties (stub,
-                                                    this->connection_handler_,
-                                                    protocol_type);
+                                                    this,
+                                                    "iiop");
 
           if (result == -1)
             return -1;
@@ -500,3 +491,29 @@ TAO_IIOP_Transport::invalidate_event_handler_i (void)
   this->connection_handler_ = 0;
   return eh;
 }
+
+void
+TAO_IIOP_Transport::update_protocol_properties (int snd_buf_sz,
+                                                int rcv_buf_sz,
+                                                int no_delay,
+                                                int enable_nw_prio)
+{
+  // Just make sure that the connection handler is sane before we go
+  // head and do anything with it.
+  ACE_GUARD (ACE_Lock,
+             ace_mon,
+             *this->handler_lock_);
+
+  if (this->check_event_handler_i (
+          "IIOP_Transport::update_protocol_properties") == -1)
+    return;
+
+  /// Making an outbound call holding a lock. This is not suposed to
+  /// be done. But it would be dangerous to leave the lock since the
+  /// connection handler could dissappear.
+  this->connection_handler_->update_protocol_properties (
+      snd_buf_sz,
+      rcv_buf_sz,
+      no_delay,
+      enable_nw_prio);
+}
diff --git a/TAO/tao/IIOP_Transport.h b/TAO/tao/IIOP_Transport.h
index 91a8ad18ff0..820f7e67e97 100644
--- a/TAO/tao/IIOP_Transport.h
+++ b/TAO/tao/IIOP_Transport.h
@@ -86,12 +86,19 @@ protected:
   virtual int register_handler_i (void);
 
   virtual int send_message_shared (TAO_Stub *stub,
-					               int message_semantics,
-							       const ACE_Message_Block *message_block,
-								   ACE_Time_Value *max_wait_time);
+                                   int message_semantics,
+                                   const ACE_Message_Block *message_block,
+                                   ACE_Time_Value *max_wait_time);
 
 
 public:
+
+  /// Bridge method to call a similar method on the connection handler
+  void update_protocol_properties (int send_buffer_size,
+                                   int recv_buffer_size,
+                                   int no_delay,
+                                   int enable_network_priority);
+
   /// @@TODO: These methods IMHO should have more meaningful
   /// names. The names seem to indicate nothing.
   virtual int send_request (TAO_Stub *stub,
@@ -106,7 +113,7 @@ public:
                             ACE_Time_Value *max_time_wait = 0);
 
   /*virtual int send_reply (TAO_OutputCDR &stream,
-			  TAO_Adapter *poa = 0);*/
+                          TAO_Adapter *poa = 0);*/
 
   virtual int generate_request_header (TAO_Operation_Details &opdetails,
                                        TAO_Target_Specification &spec,
diff --git a/TAO/tao/Makefile.tao b/TAO/tao/Makefile.tao
index 2a0a35bfff1..7f02bc8a0e6 100644
--- a/TAO/tao/Makefile.tao
+++ b/TAO/tao/Makefile.tao
@@ -952,8 +952,12 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl Object_Ref_Table.h Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h PICurrent.inl \
+  Cleanup_Func_Registry.inl Object_Ref_Table.h ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Interceptor_List.h Interceptor_List.inl PICurrent.h LocalObject.h \
+  PICurrent.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -990,6 +994,8 @@ realclean:
   Tagged_Components.h \
   CONV_FRAMEC.h \
   Tagged_Components.i \
+  Refcounted_ObjectKey.h \
+  Refcounted_ObjectKey.inl \
   Profile.i Thread_Lane_Resources.h \
   Thread_Lane_Resources.i \
   debug.h Connect_Strategy.h Client_Strategy_Factory.h
@@ -1255,8 +1261,12 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl Object_Ref_Table.h Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h PICurrent.inl \
+  Cleanup_Func_Registry.inl Object_Ref_Table.h ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Interceptor_List.h Interceptor_List.inl PICurrent.h LocalObject.h \
+  PICurrent.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -1571,8 +1581,12 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl Object_Ref_Table.h Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h PICurrent.inl \
+  Cleanup_Func_Registry.inl Object_Ref_Table.h ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Interceptor_List.h Interceptor_List.inl PICurrent.h LocalObject.h \
+  PICurrent.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -1857,8 +1871,12 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl Object_Ref_Table.h Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h PICurrent.inl \
+  Cleanup_Func_Registry.inl Object_Ref_Table.h ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Interceptor_List.h Interceptor_List.inl PICurrent.h LocalObject.h \
+  PICurrent.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -2126,8 +2144,12 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl Object_Ref_Table.h Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h PICurrent.inl \
+  Cleanup_Func_Registry.inl Object_Ref_Table.h ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Interceptor_List.h Interceptor_List.inl PICurrent.h LocalObject.h \
+  PICurrent.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -2346,6 +2368,8 @@ realclean:
   Tagged_Components.i \
   GIOP_Message_Version.h \
   GIOP_Message_Version.inl \
+  Refcounted_ObjectKey.h \
+  Refcounted_ObjectKey.inl \
   Profile.i Object_KeyC.h Messaging_PolicyValueC.h IOP_IORC.h \
   PolicyC.h \
   CurrentC.h \
@@ -2418,6 +2442,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -2444,7 +2472,7 @@ realclean:
   ORB_Core_Auto_Ptr.h \
   ORB_Core_Auto_Ptr.inl \
   Stub.i \
-  debug.h target_specification.h target_specification.i
+  debug.h target_specification.h target_specification.i ORB_Core.h
 
 .obj/Endpoint.o .obj/Endpoint.so .shobj/Endpoint.o .shobj/Endpoint.so: Endpoint.cpp \
   Endpoint.h \
@@ -2764,6 +2792,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -2792,6 +2824,8 @@ realclean:
   Tagged_Components.i \
   GIOP_Message_Version.h \
   GIOP_Message_Version.inl \
+  Refcounted_ObjectKey.h \
+  Refcounted_ObjectKey.inl \
   Profile.i \
   Transport_Connector.h \
   Transport_Connector.inl \
@@ -3048,8 +3082,12 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl Object_Ref_Table.h Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h PICurrent.inl \
+  Cleanup_Func_Registry.inl Object_Ref_Table.h ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Interceptor_List.h Interceptor_List.inl PICurrent.h LocalObject.h \
+  PICurrent.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -3091,6 +3129,246 @@ realclean:
   $(ACE_ROOT)/ace/IPC_SAP.i \
   $(ACE_ROOT)/ace/SOCK.i
 
+.obj/Thread_Per_Connection_Handler.o .obj/Thread_Per_Connection_Handler.so .shobj/Thread_Per_Connection_Handler.o .shobj/Thread_Per_Connection_Handler.so: Thread_Per_Connection_Handler.cpp \
+  Thread_Per_Connection_Handler.h \
+  $(ACE_ROOT)/ace/pre.h \
+  TAO_Export.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/Task_T.h \
+  $(ACE_ROOT)/ace/Message_Queue.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/Time_Value.h \
+  $(ACE_ROOT)/ace/Time_Value.inl \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h \
+  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/Message_Queue_T.h \
+  $(ACE_ROOT)/ace/Message_Queue_T.i \
+  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Notification_Strategy.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Notification_Strategy.inl \
+  $(ACE_ROOT)/ace/Message_Queue.i \
+  $(ACE_ROOT)/ace/Task.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Thread_Exit.h \
+  $(ACE_ROOT)/ace/Thread_Control.h \
+  $(ACE_ROOT)/ace/Thread_Control.inl \
+  $(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/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  $(ACE_ROOT)/ace/Framework_Component.h \
+  $(ACE_ROOT)/ace/Framework_Component.inl \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Framework_Component_T.h \
+  $(ACE_ROOT)/ace/Framework_Component_T.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  $(ACE_ROOT)/ace/Task.i \
+  $(ACE_ROOT)/ace/Task_T.i \
+  $(ACE_ROOT)/ace/Task_T.cpp \
+  $(ACE_ROOT)/ace/Module.h \
+  $(ACE_ROOT)/ace/Module.i \
+  $(ACE_ROOT)/ace/Module.cpp \
+  $(ACE_ROOT)/ace/Stream_Modules.h \
+  $(ACE_ROOT)/ace/Stream_Modules.cpp \
+  Connection_Handler.h LF_CH_Event.h LF_Event.h LF_Event.inl \
+  LF_Invocation_Event.inl \
+  Connection_Handler.inl \
+  debug.h \
+  TAO_Export.h \
+  Transport.h corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  orbconf.h \
+  corbafwd.i \
+  Exception.h \
+  corbafwd.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(ACE_ROOT)/ace/SStringfwd.h \
+  $(ACE_ROOT)/ace/iosfwd.h \
+  Exception.i \
+  Transport_Descriptor_Interface.h \
+  Transport_Descriptor_Interface.inl \
+  Transport_Cache_Manager.h \
+  Cache_Entries.h \
+  Transport_Descriptor_Interface.h \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  Cache_Entries.inl \
+  $(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/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(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/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/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.h \
+  $(ACE_ROOT)/ace/Auto_Ptr.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+  $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(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 \
+  Transport_Cache_Manager.inl \
+  Transport_Timer.h Incoming_Message_Queue.h Pluggable_Messaging_Utils.h \
+  IOP_IORC.h \
+  OctetSeqC.h \
+  Sequence.h \
+  Managed_Types.h \
+  Managed_Types.i \
+  Sequence.i \
+  Sequence_T.h \
+  Sequence_T.i \
+  Sequence_T.cpp \
+  Typecode.h \
+  Exception.h \
+  Pseudo_VarOut_T.h \
+  Pseudo_VarOut_T.inl \
+  Pseudo_VarOut_T.cpp \
+  Typecode.i \
+  Environment.h \
+  Environment.i \
+  Seq_Var_T.h \
+  Seq_Var_T.inl \
+  Seq_Var_T.cpp \
+  Seq_Out_T.h \
+  Seq_Out_T.inl \
+  Seq_Out_T.cpp \
+  OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  CDR.i \
+  IOP_IORC.i \
+  Pluggable_Messaging_Utils.i \
+  Incoming_Message_Queue.inl Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  Synch_Refcountable.inl Transport.inl
+
 .obj/Acceptor_Registry.o .obj/Acceptor_Registry.so .shobj/Acceptor_Registry.o .shobj/Acceptor_Registry.so: Acceptor_Registry.cpp \
   Acceptor_Registry.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -3298,6 +3576,8 @@ realclean:
   Tagged_Components.i \
   GIOP_Message_Version.h \
   GIOP_Message_Version.inl \
+  Refcounted_ObjectKey.h \
+  Refcounted_ObjectKey.inl \
   Profile.i \
   Transport_Acceptor.h \
   Transport_Acceptor.inl \
@@ -3364,6 +3644,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -4110,18 +4394,16 @@ realclean:
   Cleanup_Func_Registry.h \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
   PICurrent.inl \
   ORB_Core.i \
-  ORB_Table.h \
-  ORB_Table.inl \
   Server_Strategy_Factory.h \
-  Connector_Registry.h \
-  Endpoint.h \
-  Endpoint.i \
-  Connector_Registry.i \
   Transport_Cache_Manager.h \
   Cache_Entries.h \
   Transport_Descriptor_Interface.h \
@@ -4139,6 +4421,7 @@ realclean:
   Synch_Refcountable.h \
   Synch_Refcountable.inl \
   Transport.inl \
+  Thread_Per_Connection_Handler.h \
   $(ACE_ROOT)/ace/SOCK_Acceptor.h \
   $(ACE_ROOT)/ace/SOCK_Acceptor.i \
   GIOP_Message_Version.h \
@@ -4506,18 +4789,16 @@ realclean:
   Cleanup_Func_Registry.h \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
   PICurrent.inl \
   ORB_Core.i \
-  ORB_Table.h \
-  ORB_Table.inl \
   Server_Strategy_Factory.h \
-  Connector_Registry.h \
-  Endpoint.h \
-  Endpoint.i \
-  Connector_Registry.i \
   Transport_Cache_Manager.h \
   Cache_Entries.h \
   Transport_Descriptor_Interface.h \
@@ -4535,6 +4816,7 @@ realclean:
   Synch_Refcountable.h \
   Synch_Refcountable.inl \
   Transport.inl \
+  Thread_Per_Connection_Handler.h \
   $(ACE_ROOT)/ace/SOCK_Acceptor.h \
   $(ACE_ROOT)/ace/SOCK_Acceptor.i \
   GIOP_Message_Version.h \
@@ -4756,6 +5038,8 @@ realclean:
   Tagged_Components.i \
   GIOP_Message_Version.h \
   GIOP_Message_Version.inl \
+  Refcounted_ObjectKey.h \
+  Refcounted_ObjectKey.inl \
   Profile.i \
   IIOP_Endpoint.h \
   Endpoint.h \
@@ -4819,8 +5103,12 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl Object_Ref_Table.h Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h PICurrent.inl \
+  Cleanup_Func_Registry.inl Object_Ref_Table.h ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Interceptor_List.h Interceptor_List.inl PICurrent.h LocalObject.h \
+  PICurrent.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -5207,20 +5495,19 @@ realclean:
   Cleanup_Func_Registry.h \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
   PICurrent.inl \
   ORB_Core.i \
-  ORB_Table.h \
-  ORB_Table.inl \
   Server_Strategy_Factory.h \
-  Connector_Registry.h \
-  Endpoint.h \
-  Endpoint.i \
-  Connector_Registry.i \
   Thread_Lane_Resources.h \
   Thread_Lane_Resources.i \
+  Thread_Per_Connection_Handler.h \
   $(ACE_ROOT)/ace/SOCK_Acceptor.h \
   $(ACE_ROOT)/ace/SOCK_Acceptor.i \
   GIOP_Message_Version.h \
@@ -5230,8 +5517,12 @@ realclean:
   Profile.h \
   Tagged_Components.h \
   Tagged_Components.i \
+  Refcounted_ObjectKey.h \
+  Refcounted_ObjectKey.inl \
   Profile.i \
   IIOP_Endpoint.h \
+  Endpoint.h \
+  Endpoint.i \
   IIOP_Endpoint.i \
   IIOP_Profile.i \
   Acceptor_Registry.h \
@@ -5249,12 +5540,6 @@ realclean:
   TimeBaseC.i \
   TAOC.i \
   Sync_Strategies.i \
-  Stub.h \
-  MProfile.h \
-  MProfile.i \
-  ORB_Core_Auto_Ptr.h \
-  ORB_Core_Auto_Ptr.inl \
-  Stub.i \
   ORB_Core.h debug.h GIOP_Message_Base.h \
   Pluggable_Messaging.h \
   Pluggable_Messaging.i \
@@ -5581,6 +5866,8 @@ realclean:
   Tagged_Components.i \
   GIOP_Message_Version.h \
   GIOP_Message_Version.inl \
+  Refcounted_ObjectKey.h \
+  Refcounted_ObjectKey.inl \
   Profile.i \
   IIOP_Endpoint.h \
   Endpoint.h \
@@ -5621,8 +5908,12 @@ realclean:
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
   Cleanup_Func_Registry.h TAO_Export.h Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h Interceptor_List.h Interceptor_List.inl PICurrent.h \
-  LocalObject.h PICurrent.inl ORB_Core.i Client_Strategy_Factory.h \
+  Object_Ref_Table.h ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Interceptor_List.h Interceptor_List.inl PICurrent.h LocalObject.h \
+  PICurrent.inl ORB_Core.i Client_Strategy_Factory.h \
   Base_Transport_Property.h \
   Transport_Descriptor_Interface.h \
   Transport_Descriptor_Interface.inl \
@@ -5995,18 +6286,16 @@ realclean:
   Cleanup_Func_Registry.h \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
   PICurrent.inl \
   ORB_Core.i \
-  ORB_Table.h \
-  ORB_Table.inl \
   Server_Strategy_Factory.h \
-  Connector_Registry.h \
-  Endpoint.h \
-  Endpoint.i \
-  Connector_Registry.i \
   Transport_Cache_Manager.h \
   Cache_Entries.h \
   Transport_Descriptor_Interface.h \
@@ -6024,6 +6313,7 @@ realclean:
   Synch_Refcountable.h \
   Synch_Refcountable.inl \
   Transport.inl \
+  Thread_Per_Connection_Handler.h \
   $(ACE_ROOT)/ace/SOCK_Acceptor.h \
   $(ACE_ROOT)/ace/SOCK_Acceptor.i \
   GIOP_Message_Version.h \
@@ -6033,8 +6323,12 @@ realclean:
   Profile.h \
   Tagged_Components.h \
   Tagged_Components.i \
+  Refcounted_ObjectKey.h \
+  Refcounted_ObjectKey.inl \
   Profile.i \
   IIOP_Endpoint.h \
+  Endpoint.h \
+  Endpoint.i \
   IIOP_Endpoint.i \
   IIOP_Profile.i \
   MProfile.h \
@@ -6373,6 +6667,10 @@ realclean:
   Cleanup_Func_Registry.h \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -7049,8 +7347,12 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl Object_Ref_Table.h Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h PICurrent.inl \
+  Cleanup_Func_Registry.inl Object_Ref_Table.h ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Interceptor_List.h Interceptor_List.inl PICurrent.h LocalObject.h \
+  PICurrent.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -7344,6 +7646,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -7632,6 +7938,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -8310,6 +8620,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -8751,6 +9065,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -9251,6 +9569,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -9273,10 +9595,7 @@ realclean:
   $(ACE_ROOT)/ace/Framework_Component_T.inl \
   $(ACE_ROOT)/ace/Framework_Component_T.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
-  Codeset_Translator_Factory.h \
-  Codeset_Translator_Factory_T.h \
-  Codeset_Translator_Factory_T.cpp
+  ORB_Core.i
 
 .obj/CORBA_String.o .obj/CORBA_String.so .shobj/CORBA_String.o .shobj/CORBA_String.so: CORBA_String.cpp \
   CORBA_String.h \
@@ -9771,6 +10090,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -10062,6 +10385,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -10393,6 +10720,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -10682,6 +11013,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -10713,6 +11048,8 @@ realclean:
   Tagged_Components.i \
   GIOP_Message_Version.h \
   GIOP_Message_Version.inl \
+  Refcounted_ObjectKey.h \
+  Refcounted_ObjectKey.inl \
   Profile.i \
   Invocation.h \
   Synch_Reply_Dispatcher.h \
@@ -11217,6 +11554,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -11516,6 +11857,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -11549,6 +11894,8 @@ realclean:
   Tagged_Components.i \
   GIOP_Message_Version.h \
   GIOP_Message_Version.inl \
+  Refcounted_ObjectKey.h \
+  Refcounted_ObjectKey.inl \
   Profile.i default_ports.h ORBInitInfo.h PortableInterceptorC.h \
   LocalObject.h StringSeqC.h ORBInitInfo.inl ORBInitializer_Registry.h \
   CodecFactory_ORBInitializer.h TypeCodeFactory_Adapter.h \
@@ -11885,6 +12232,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -12176,6 +12527,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -12489,8 +12844,12 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl Object_Ref_Table.h Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h PICurrent.inl \
+  Cleanup_Func_Registry.inl Object_Ref_Table.h ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Interceptor_List.h Interceptor_List.inl PICurrent.h LocalObject.h \
+  PICurrent.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -12902,6 +13261,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -13234,6 +13597,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -13575,6 +13942,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -14162,6 +14533,8 @@ realclean:
   Tagged_Components.i \
   GIOP_Message_Version.h \
   GIOP_Message_Version.inl \
+  Refcounted_ObjectKey.h \
+  Refcounted_ObjectKey.inl \
   Profile.i
 
 .obj/Stub.o .obj/Stub.so .shobj/Stub.o .shobj/Stub.so: Stub.cpp Endpoint.h \
@@ -14430,6 +14803,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -14461,6 +14838,8 @@ realclean:
   Tagged_Components.i \
   GIOP_Message_Version.h \
   GIOP_Message_Version.inl \
+  Refcounted_ObjectKey.h \
+  Refcounted_ObjectKey.inl \
   Profile.i Sequence.h Object.h Invocation.h CDR.h \
   Synch_Reply_Dispatcher.h \
   Reply_Dispatcher.h \
@@ -14950,6 +15329,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -15286,6 +15669,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -16172,6 +16559,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -16201,6 +16592,8 @@ realclean:
   Profile.h \
   Tagged_Components.h \
   Tagged_Components.i \
+  Refcounted_ObjectKey.h \
+  Refcounted_ObjectKey.inl \
   Profile.i Timeprobe.h \
   $(ACE_ROOT)/ace/Timeprobe.h \
   Object_KeyC.h debug.h Connector_Registry.h Endpoint.h \
@@ -16520,6 +16913,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -16549,6 +16946,8 @@ realclean:
   Profile.h \
   Tagged_Components.h \
   Tagged_Components.i \
+  Refcounted_ObjectKey.h \
+  Refcounted_ObjectKey.inl \
   Profile.i \
   Endpoint.h \
   Endpoint.i \
@@ -16860,6 +17259,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -16889,6 +17292,8 @@ realclean:
   Profile.h \
   Tagged_Components.h \
   Tagged_Components.i \
+  Refcounted_ObjectKey.h \
+  Refcounted_ObjectKey.inl \
   Profile.i \
   Transport_Mux_Strategy.h
 
@@ -17603,6 +18008,10 @@ realclean:
   Cleanup_Func_Registry.h \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
@@ -17630,6 +18039,8 @@ realclean:
   Profile.h \
   Tagged_Components.h \
   Tagged_Components.i \
+  Refcounted_ObjectKey.h \
+  Refcounted_ObjectKey.inl \
   Profile.i Tagged_Components.h Valuetype_Adapter.h debug.h \
   $(ACE_ROOT)/ace/Dynamic_Service.h \
   $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
@@ -18107,6 +18518,10 @@ realclean:
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
   Cleanup_Func_Registry.h Cleanup_Func_Registry.inl Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   PICurrent.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
@@ -18545,6 +18960,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -18860,7 +19279,11 @@ realclean:
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
   Cleanup_Func_Registry.h TAO_Export.h Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h Interceptor_List.h Interceptor_List.inl \
+  Object_Ref_Table.h ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Interceptor_List.h Interceptor_List.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -19134,6 +19557,10 @@ realclean:
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
   Cleanup_Func_Registry.h Cleanup_Func_Registry.inl Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h Interceptor_List.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
@@ -19421,6 +19848,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -19755,6 +20186,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -20268,6 +20703,8 @@ realclean:
   Tagged_Components.i \
   GIOP_Message_Version.h \
   GIOP_Message_Version.inl \
+  Refcounted_ObjectKey.h \
+  Refcounted_ObjectKey.inl \
   Profile.i \
   Codeset_Translator_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
@@ -20700,8 +21137,12 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl Object_Ref_Table.h Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h PICurrent.inl \
+  Cleanup_Func_Registry.inl Object_Ref_Table.h ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Interceptor_List.h Interceptor_List.inl PICurrent.h LocalObject.h \
+  PICurrent.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -20739,6 +21180,8 @@ realclean:
   Tagged_Components.i \
   GIOP_Message_Version.h \
   GIOP_Message_Version.inl \
+  Refcounted_ObjectKey.h \
+  Refcounted_ObjectKey.inl \
   Profile.i Stub.h \
   MProfile.h \
   ORB.h \
@@ -20805,7 +21248,6 @@ realclean:
   Thread_Lane_Resources_Manager.h \
   Thread_Lane_Resources_Manager.i \
   Protocols_Hooks.h IORInterceptor_Adapter.h \
-  Interceptor_List.h \
   Buffering_Constraint_Policy.h \
   Buffering_Constraint_Policy.i \
   LF_Event_Loop_Thread_Helper.h \
@@ -21070,8 +21512,12 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl Object_Ref_Table.h Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h PICurrent.inl \
+  Cleanup_Func_Registry.inl Object_Ref_Table.h ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Interceptor_List.h Interceptor_List.inl PICurrent.h LocalObject.h \
+  PICurrent.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -21626,8 +22072,12 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl Object_Ref_Table.h Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h PICurrent.inl \
+  Cleanup_Func_Registry.inl Object_Ref_Table.h ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Interceptor_List.h Interceptor_List.inl PICurrent.h LocalObject.h \
+  PICurrent.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -21916,6 +22366,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -22214,6 +22668,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -22513,6 +22971,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -22811,6 +23273,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -23138,6 +23604,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -23463,6 +23933,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -23838,6 +24312,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -24245,6 +24723,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -24606,6 +25088,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -24896,8 +25382,12 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl Object_Ref_Table.h Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h PICurrent.inl \
+  Cleanup_Func_Registry.inl Object_Ref_Table.h ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Interceptor_List.h Interceptor_List.inl PICurrent.h LocalObject.h \
+  PICurrent.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -25197,7 +25687,11 @@ realclean:
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
   Cleanup_Func_Registry.h TAO_Export.h Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h Interceptor_List.h Interceptor_List.inl \
+  Object_Ref_Table.h ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Interceptor_List.h Interceptor_List.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -26173,6 +26667,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -26490,6 +26988,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -27230,8 +27732,12 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl Object_Ref_Table.h Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h PICurrent.inl \
+  Cleanup_Func_Registry.inl Object_Ref_Table.h ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Interceptor_List.h Interceptor_List.inl PICurrent.h LocalObject.h \
+  PICurrent.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -27575,6 +28081,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -27951,6 +28461,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -28426,6 +28940,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -28760,6 +29278,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -29244,6 +29766,8 @@ realclean:
   Profile.h \
   GIOP_Message_Version.h \
   GIOP_Message_Version.inl \
+  Refcounted_ObjectKey.h \
+  Refcounted_ObjectKey.inl \
   Profile.i \
   ORB_Core.h \
   ORB.h \
@@ -29313,6 +29837,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -29988,6 +30516,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -31420,6 +31952,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -32155,8 +32691,12 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl Object_Ref_Table.h Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h PICurrent.inl \
+  Cleanup_Func_Registry.inl Object_Ref_Table.h ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Interceptor_List.h Interceptor_List.inl PICurrent.h LocalObject.h \
+  PICurrent.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -32482,6 +33022,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -32757,8 +33301,12 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl Object_Ref_Table.h Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h PICurrent.inl \
+  Cleanup_Func_Registry.inl Object_Ref_Table.h ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Interceptor_List.h Interceptor_List.inl PICurrent.h LocalObject.h \
+  PICurrent.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -33262,6 +33810,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -33500,12 +34052,6 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Interceptor_List.inl \
-  IORInterceptor_Adapter.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
   CORBA_String.h \
   CORBA_String.inl \
   ORB_Core.h \
@@ -33523,6 +34069,11 @@ realclean:
   LocalObject.i \
   Policy_Manager.i \
   Resource_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
   CONV_FRAMEC.h \
   CONV_FRAMEC.i \
   params.h \
@@ -33552,6 +34103,10 @@ realclean:
   Cleanup_Func_Registry.h \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   PICurrent.h \
   PICurrent.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
@@ -33600,17 +34155,14 @@ realclean:
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   corbafwd.i \
-  Interceptor_List.h \
-  PortableInterceptorC.h \
-  PI_ForwardC.h \
-  OctetSeqC.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
+  Exception.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
   $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/SStringfwd.h \
+  $(ACE_ROOT)/ace/iosfwd.h \
+  Exception.i \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -33624,177 +34176,10 @@ realclean:
   $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/Trace.h \
   $(ACE_ROOT)/ace/OS.i \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(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 \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Typecode.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/Flag_Manip.h \
-  $(ACE_ROOT)/ace/Flag_Manip.i \
-  $(ACE_ROOT)/ace/Handle_Ops.h \
-  $(ACE_ROOT)/ace/Handle_Ops.i \
-  $(ACE_ROOT)/ace/Lib_Find.h \
-  $(ACE_ROOT)/ace/Lib_Find.i \
-  $(ACE_ROOT)/ace/Init_ACE.h \
-  $(ACE_ROOT)/ace/Init_ACE.i \
-  $(ACE_ROOT)/ace/Sock_Connect.h \
-  $(ACE_ROOT)/ace/Sock_Connect.i \
-  $(ACE_ROOT)/ace/ACE.i \
-  $(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/Synch.h \
-  $(ACE_ROOT)/ace/Synch.i \
-  $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch_T.i \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread.i \
-  $(ACE_ROOT)/ace/Synch_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(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/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/SStringfwd.h \
-  $(ACE_ROOT)/ace/String_Base.h \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(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/Free_List.h \
-  $(ACE_ROOT)/ace/Free_List.i \
-  $(ACE_ROOT)/ace/Free_List.cpp \
-  $(ACE_ROOT)/ace/Malloc_T.i \
-  $(ACE_ROOT)/ace/Malloc_T.cpp \
-  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.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/Memory_Pool.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.h \
-  $(ACE_ROOT)/ace/Auto_Ptr.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
-  $(ACE_ROOT)/ace/SString.i \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(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 \
-  Exception.h \
-  $(ACE_ROOT)/ace/iosfwd.h \
-  Exception.i \
-  Pseudo_VarOut_T.h \
-  Pseudo_VarOut_T.inl \
-  Pseudo_VarOut_T.cpp \
-  Typecode.i \
-  Environment.h \
-  Environment.i \
-  Seq_Var_T.h \
-  Seq_Var_T.inl \
-  Seq_Var_T.cpp \
-  Seq_Out_T.h \
-  Seq_Out_T.inl \
-  Seq_Out_T.cpp \
-  OctetSeqC.i \
-  StringSeqC.h \
-  StringSeqC.i \
-  PI_ForwardC.i \
-  DynamicC.h \
-  Any_Dual_Impl_T.h \
-  Any.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  Object.h \
-  Policy_ForwardC.h \
-  CDR.h \
-  CDR.i \
-  Objref_VarOut_T.h \
-  varbase.h \
-  Objref_VarOut_T.inl \
-  Objref_VarOut_T.cpp \
-  Policy_ForwardC.i \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  IOP_IORC.h \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
-  IOP_IORC.i \
-  Object.i \
-  Any.i \
-  Any_Dual_Impl_T.inl \
-  Any_Dual_Impl_T.cpp \
-  Marshal.h \
-  Marshal.i \
-  debug.h \
-  DynamicC.i \
-  Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i \
-  IOPC.h \
-  IOP_CodecC.h \
-  Any_Impl_T.h \
-  Any_Impl_T.inl \
-  Any_Impl_T.cpp \
-  IOP_CodecC.i \
-  IOPC.i \
-  PolicyC.h \
-  CurrentC.h \
-  CurrentC.i \
-  Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h \
-  PolicyC.i \
-  PortableInterceptorC.i \
-  $(ACE_ROOT)/ace/Array_Base.h \
-  $(ACE_ROOT)/ace/Array_Base.inl \
-  $(ACE_ROOT)/ace/Array_Base.cpp \
-  Interceptor_List.inl \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
   $(ACE_ROOT)/ace/Dynamic_Service.h \
@@ -34096,8 +34481,11 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl Object_Ref_Table.h Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h PICurrent.inl \
+  Cleanup_Func_Registry.inl Object_Ref_Table.h ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Interceptor_List.h Interceptor_List.inl PICurrent.h PICurrent.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -35064,6 +35452,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -36540,8 +36932,12 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl Object_Ref_Table.h Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h PICurrent.inl \
+  Cleanup_Func_Registry.inl Object_Ref_Table.h ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Interceptor_List.h Interceptor_List.inl PICurrent.h LocalObject.h \
+  PICurrent.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -36859,8 +37255,12 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl Object_Ref_Table.h Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h PICurrent.inl \
+  Cleanup_Func_Registry.inl Object_Ref_Table.h ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Interceptor_List.h Interceptor_List.inl PICurrent.h LocalObject.h \
+  PICurrent.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -37147,8 +37547,12 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl Object_Ref_Table.h Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h PICurrent.inl \
+  Cleanup_Func_Registry.inl Object_Ref_Table.h ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Interceptor_List.h Interceptor_List.inl PICurrent.h LocalObject.h \
+  PICurrent.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -38386,6 +38790,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -38704,6 +39112,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -39006,6 +39418,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -39311,6 +39727,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -39588,7 +40008,11 @@ realclean:
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
   Cleanup_Func_Registry.h TAO_Export.h Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h Interceptor_List.h Interceptor_List.inl \
+  Object_Ref_Table.h ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Interceptor_List.h Interceptor_List.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -39657,6 +40081,438 @@ realclean:
   $(ACE_ROOT)/ace/Dynamic_Service.i \
   $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
+.obj/ObjectKey_Table.o .obj/ObjectKey_Table.so .shobj/ObjectKey_Table.o .shobj/ObjectKey_Table.so: ObjectKey_Table.cpp ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Time_Value.h \
+  $(ACE_ROOT)/ace/Time_Value.inl \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h \
+  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(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/RB_Tree.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.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_Base.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/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 \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SStringfwd.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Auto_Ptr.h \
+  $(ACE_ROOT)/ace/Auto_Ptr.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+  $(ACE_ROOT)/ace/SString.i \
+  TAO_Export.h \
+  ORB_Core.h corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  orbconf.h \
+  corbafwd.i \
+  ORB.h Exception.h \
+  corbafwd.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(ACE_ROOT)/ace/iosfwd.h \
+  Exception.i \
+  ServicesC.h \
+  OctetSeqC.h \
+  Sequence.h \
+  Managed_Types.h \
+  Managed_Types.i \
+  $(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 \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  Sequence.i \
+  Sequence_T.h \
+  Sequence_T.i \
+  Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(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/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(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 \
+  Exception.h \
+  Pseudo_VarOut_T.h \
+  Pseudo_VarOut_T.inl \
+  Pseudo_VarOut_T.cpp \
+  Typecode.i \
+  Environment.h \
+  Environment.i \
+  Seq_Var_T.h \
+  Seq_Var_T.inl \
+  Seq_Var_T.cpp \
+  Seq_Out_T.h \
+  Seq_Out_T.inl \
+  Seq_Out_T.cpp \
+  OctetSeqC.i \
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  CDR.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
+  ServicesC.i CORBA_String.h \
+  CORBA_String.inl \
+  ObjectIdListC.h ObjectIdListC.i objectid.h PolicyC.h CurrentC.h \
+  Object.h \
+  Policy_ForwardC.h \
+  Objref_VarOut_T.h \
+  varbase.h \
+  Objref_VarOut_T.inl \
+  Objref_VarOut_T.cpp \
+  Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  IOP_IORC.h \
+  IOP_IORC.i \
+  Object.i \
+  Any_Impl_T.h \
+  Any.h \
+  Any.i \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
+  CurrentC.i Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
+  Object_Proxy_Impl.h \
+  PolicyC.i \
+  ORB.i \
+  Environment.h Policy_Manager.h \
+  Policy_Set.h \
+  PolicyC.h \
+  Policy_Set.i \
+  LocalObject.h \
+  LocalObject.i \
+  Policy_Manager.i \
+  Resource_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h CONV_FRAMEC.i params.h \
+  params.i \
+  TAO_Singleton_Manager.h \
+  TAO_Singleton_Manager.inl \
+  TAO_Singleton.h \
+  TAO_Singleton.inl \
+  TAO_Singleton.cpp \
+  TAO_Singleton.h \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  TAO_Singleton_Manager.h \
+  Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \
+  PI_ForwardC.h OctetSeqC.h StringSeqC.h Sequence.h StringSeqC.i \
+  PI_ForwardC.i DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
+  DynamicC.i Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h \
+  IOP_CodecC.h \
+  IOP_CodecC.i \
+  IOPC.i PortableInterceptorC.i \
+  $(ACE_ROOT)/ace/Map_Manager.h \
+  $(ACE_ROOT)/ace/Map_Manager.i \
+  $(ACE_ROOT)/ace/Map_Manager.cpp \
+  Parser_Registry.h \
+  Parser_Registry.i \
+  Service_Callbacks.h \
+  IOPC.h \
+  Service_Callbacks.i \
+  Fault_Tolerance_Service.h \
+  Fault_Tolerance_Service.i \
+  Cleanup_Func_Registry.h TAO_Export.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  Cleanup_Func_Registry.inl Object_Ref_Table.h Interceptor_List.h \
+  Interceptor_List.inl PICurrent.h LocalObject.h PICurrent.inl \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Thread_Exit.h \
+  $(ACE_ROOT)/ace/Thread_Control.h \
+  $(ACE_ROOT)/ace/Thread_Control.inl \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(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/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Framework_Component.h \
+  $(ACE_ROOT)/ace/Framework_Component.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.h \
+  $(ACE_ROOT)/ace/Framework_Component_T.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  ORB_Core.i Refcounted_ObjectKey.h Refcounted_ObjectKey.inl \
+  Object_KeyC.h
+
+.obj/Refcounted_ObjectKey.o .obj/Refcounted_ObjectKey.so .shobj/Refcounted_ObjectKey.o .shobj/Refcounted_ObjectKey.so: Refcounted_ObjectKey.cpp Refcounted_ObjectKey.h \
+  $(ACE_ROOT)/ace/pre.h \
+  Object_KeyC.h \
+  corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  orbconf.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  TAO_Export.h \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  corbafwd.i \
+  Seq_Var_T.h \
+  Seq_Var_T.inl \
+  Seq_Var_T.cpp \
+  Seq_Out_T.h \
+  Seq_Out_T.inl \
+  Seq_Out_T.cpp \
+  Sequence_T.h \
+  Sequence.h \
+  Managed_Types.h \
+  Managed_Types.i \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Time_Value.h \
+  $(ACE_ROOT)/ace/Time_Value.inl \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h \
+  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(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 \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  Sequence.i \
+  Sequence_T.i \
+  Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(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/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(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/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SStringfwd.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(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/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(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/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.h \
+  $(ACE_ROOT)/ace/Auto_Ptr.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+  $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(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 \
+  Exception.h \
+  $(ACE_ROOT)/ace/iosfwd.h \
+  Exception.i \
+  Pseudo_VarOut_T.h \
+  Pseudo_VarOut_T.inl \
+  Pseudo_VarOut_T.cpp \
+  Typecode.i \
+  Environment.h \
+  Environment.i \
+  Object_KeyC.i \
+  Refcounted_ObjectKey.inl
+
 .obj/ServicesC.o .obj/ServicesC.so .shobj/ServicesC.o .shobj/ServicesC.so: ServicesC.cpp ServicesC.h \
   $(ACE_ROOT)/ace/pre.h \
   OctetSeqC.h \
@@ -39919,6 +40775,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -40411,6 +41271,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -40701,6 +41565,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -41204,6 +42072,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -41667,6 +42539,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -41959,8 +42835,12 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl Object_Ref_Table.h Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h PICurrent.inl \
+  Cleanup_Func_Registry.inl Object_Ref_Table.h ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Interceptor_List.h Interceptor_List.inl PICurrent.h LocalObject.h \
+  PICurrent.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -42294,6 +43174,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -42831,7 +43715,11 @@ realclean:
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
   Cleanup_Func_Registry.h TAO_Export.h Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h Interceptor_List.h Interceptor_List.inl \
+  Object_Ref_Table.h ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Interceptor_List.h Interceptor_List.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -43152,7 +44040,11 @@ realclean:
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
   Cleanup_Func_Registry.h TAO_Export.h Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h Interceptor_List.h Interceptor_List.inl \
+  Object_Ref_Table.h ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Interceptor_List.h Interceptor_List.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -43489,6 +44381,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -44199,6 +45095,10 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Cleanup_Func_Registry.inl \
   Object_Ref_Table.h \
+  ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   Interceptor_List.h \
   Interceptor_List.inl \
   PICurrent.h \
@@ -44501,8 +45401,12 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl Object_Ref_Table.h Interceptor_List.h \
-  Interceptor_List.inl PICurrent.h LocalObject.h PICurrent.inl \
+  Cleanup_Func_Registry.inl Object_Ref_Table.h ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  Interceptor_List.h Interceptor_List.inl PICurrent.h LocalObject.h \
+  PICurrent.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index 3299e2a759b..fcb8351f91e 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -125,6 +125,7 @@ TAO_ORB_Core_Static_Resources::TAO_ORB_Core_Static_Resources (void)
 
 TAO_ORB_Core::TAO_ORB_Core (const char *orbid)
   : protocols_hooks_ (0),
+    protocols_hooks_checked_ (false),
     lock_ (),
     thread_lane_resources_manager_ (0),
     collocation_resolver_ (0),
@@ -1323,26 +1324,42 @@ TAO_ORB_Core::endpoint_selector_factory (void)
 void
 TAO_ORB_Core::set_protocols_hooks (const char *protocols_hooks_name)
 {
+  // Is synchronization necessary?
   TAO_ORB_Core_Static_Resources::instance ()->protocols_hooks_name_ =
     protocols_hooks_name;
+
+  // Probably we need to reset the
+  // TAO_ORB_Core::protocols_hooks_checked_ flag. Not sure how to do
+  // it though.
 }
 
 TAO_Protocols_Hooks *
 TAO_ORB_Core::get_protocols_hooks (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Check if there is a cached reference.
-  if (this->protocols_hooks_ != 0)
-    return this->protocols_hooks_;
+  if (this->protocols_hooks_ != 0 &&
+      this->protocols_hooks_checked_ == false)
+    {
+      // We need synchronization here since this is called in the
+      // critical path where more than one thread could be active on
+      // different handlers.
+      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
+                        ace_mon,
+                        this->lock_,
+                        0);
 
-  // If not, look in the service repository for an instance.
-  this->protocols_hooks_ =
-    ACE_Dynamic_Service<TAO_Protocols_Hooks>::instance
-    (TAO_ORB_Core_Static_Resources::instance ()->protocols_hooks_name_.c_str());
+      // If not, look in the service repository for an instance.
+      this->protocols_hooks_ =
+        ACE_Dynamic_Service<TAO_Protocols_Hooks>::instance
+        (TAO_ORB_Core_Static_Resources::instance ()->protocols_hooks_name_.c_str());
 
-  // Initialize the protocols hooks instance.
-  this->protocols_hooks_->init_hooks (this
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+      // Initialize the protocols hooks instance.
+      this->protocols_hooks_->init_hooks (this
+                                          ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      this->protocols_hooks_checked_ = true;
+    }
 
   return this->protocols_hooks_;
 }
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
index 2a67b373fa4..d6e9faddeff 100644
--- a/TAO/tao/ORB_Core.h
+++ b/TAO/tao/ORB_Core.h
@@ -648,6 +648,10 @@ public:
   /// Handle to the factory for protocols_hooks_..
   TAO_Protocols_Hooks *protocols_hooks_;
 
+  /// Flag to check whether the protocols hooks have been checked or
+  /// not.
+  bool protocols_hooks_checked_;
+
   /// Obtain the TSS resources of this orb.
   TAO_ORB_Core_TSS_Resources* get_tss_resources (void);
 
diff --git a/TAO/tao/Protocols_Hooks.h b/TAO/tao/Protocols_Hooks.h
index 64ff42874f5..eb9d0f80794 100644
--- a/TAO/tao/Protocols_Hooks.h
+++ b/TAO/tao/Protocols_Hooks.h
@@ -30,6 +30,7 @@ class TAO_Resource_Factory;
 class TAO_Service_Context;
 class TAO_Acceptor_Registry;
 class TAO_Connection_Handler;
+class TAO_Transport;
 class TAO_Stub;
 
 class TAO_Export TAO_Protocols_Hooks : public ACE_Service_Object
@@ -45,48 +46,32 @@ public:
   virtual int call_client_protocols_hook (int &send_buffer_size,
                                           int &recv_buffer_size,
                                           int &no_delay,
-					  int &enable_network_priority,
+                                          int &enable_network_priority,
                                           const char *protocol_type) = 0;
 
   virtual int call_server_protocols_hook (int &send_buffer_size,
                                           int &recv_buffer_size,
                                           int &no_delay,
-					  int &enable_network_priority,
+                                          int &enable_network_priority,
                                           const char *protocol_type) = 0;
-/*
-  virtual int get_effective_client_protocol_properties (TAO_Stub *stub,
-							int &send_buffer_size,
-							int &recv_buffer_size,
-							int &no_delay,
-							int &enable_network_priority,
-							const char *protocol_type) = 0;
-  
-
-  virtual int get_effective_server_protocol_properties (TAO_Adapter *poa,
-							int &send_buffer_size,
-							int &recv_buffer_size,
-							int &no_delay,
-							int &enable_network_priority,
-							const char *protocol_type) = 0;
-
-  */
-    virtual int update_client_protocol_properties (TAO_Stub *stub,
-						   TAO_Connection_Handler * connection_handler,
-						   const char *protocol_type) = 0;
-  
-  
+
+  virtual int update_client_protocol_properties (TAO_Stub *stub,
+                                                 TAO_Transport *t,
+                                                 const char *protocol_type) = 0;
+
+
   virtual int update_server_protocol_properties (CORBA::Policy *policy,
-						 TAO_Connection_Handler * connection_handler,
-						 const char *protocol_type) = 0;
-  
-  
+                                                 TAO_Transport *t,
+                                                 const char *protocol_type) = 0;
+
+
   virtual CORBA::Long get_dscp_codepoint (void) = 0;
-  
+
   virtual void rt_service_context (TAO_Stub *stub,
                                    TAO_Service_Context &service_context,
                                    CORBA::Boolean restart
                                    ACE_ENV_ARG_DECL) = 0;
-  
+
   virtual void add_rt_service_context_hook (TAO_Service_Context &service_context,
                                             CORBA::Policy *model_policy,
                                             CORBA::Short &client_priority
diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
index b0478b816a3..1181e21ed62 100644
--- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
+++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
@@ -12,7 +12,7 @@
 #include "tao/Transport_Connector.h"
 #include "Priority_Mapping_Manager.h"
 #include "RT_Stub.h"
-#include "tao/IIOP_Connection_Handler.h"
+#include "tao/IIOP_Transport.h"
 
 #include "ace/Dynamic_Service.h"
 
@@ -42,7 +42,7 @@ TAO_RT_Protocols_Hooks::init_hooks (TAO_ORB_Core *orb_core
   // Save a reference to the priority mapping manager.
   CORBA::Object_var obj =
     orb_core->object_ref_table ().resolve_initial_references (TAO_OBJID_PRIORITYMAPPINGMANAGER
-							      ACE_ENV_ARG_PARAMETER);
+                                                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->mapping_manager_ =
@@ -58,18 +58,18 @@ TAO_RT_Protocols_Hooks::init_hooks (TAO_ORB_Core *orb_core
 
   this->network_mapping_manager_ =
     TAO_Network_Priority_Mapping_Manager::_narrow (object.in ()
-						   ACE_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   object =
     this->orb_core_->object_ref_table ().resolve_initial_references (
-								     "RTCurrent"
-								     ACE_ENV_ARG_PARAMETER);
+                                                                     "RTCurrent"
+                                                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->current_ =
     RTCORBA::Current::_narrow (object.in ()
-			       ACE_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
 }
@@ -78,7 +78,7 @@ int
 TAO_RT_Protocols_Hooks::call_client_protocols_hook (int &send_buffer_size,
                                                     int &recv_buffer_size,
                                                     int &no_delay,
-						    int &enable_network_priority,
+                                                    int &enable_network_priority,
                                                     const char *protocol_type)
 {
   if (TAO_RT_Protocols_Hooks::client_protocols_hook_ == 0)
@@ -88,7 +88,7 @@ TAO_RT_Protocols_Hooks::call_client_protocols_hook (int &send_buffer_size,
                                                      send_buffer_size,
                                                      recv_buffer_size,
                                                      no_delay,
-						     enable_network_priority,
+                                                     enable_network_priority,
                                                      protocol_type);
 
   return 0;
@@ -105,7 +105,7 @@ int
 TAO_RT_Protocols_Hooks::call_server_protocols_hook (int &send_buffer_size,
                                                     int &recv_buffer_size,
                                                     int &no_delay,
-						    int &enable_network_priority,
+                                                    int &enable_network_priority,
                                                     const char *protocol_type)
 {
   if (TAO_RT_Protocols_Hooks::server_protocols_hook_ == 0)
@@ -116,7 +116,7 @@ TAO_RT_Protocols_Hooks::call_server_protocols_hook (int &send_buffer_size,
                                                        send_buffer_size,
                                                        recv_buffer_size,
                                                        no_delay,
-						       enable_network_priority,
+                                                       enable_network_priority,
                                                        protocol_type);
 
   if (result_value != 0)
@@ -134,20 +134,20 @@ TAO_RT_Protocols_Hooks::set_server_protocols_hook (Server_Protocols_Hook hook)
 
 int
 TAO_RT_Protocols_Hooks::update_client_protocol_properties (TAO_Stub *stub,
-							   TAO_Connection_Handler *connection_handler,
-							   const char *protocol_type)
+                                                           TAO_Transport *transport,
+                                                           const char *protocol_type)
 {
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG,
-		"TAO_RT_Protocols_Hooks::get_effective_client_protocol_properties\n"));
+                "TAO_RT_Protocols_Hooks::get_effective_client_protocol_properties\n"));
 
   ACE_TRY_NEW_ENV
     {
       RTCORBA::ProtocolProperties_var properties =
-	RTCORBA::ProtocolProperties::_nil ();
+        RTCORBA::ProtocolProperties::_nil ();
 
       TAO_RT_Stub *rt_stub = ACE_dynamic_cast (TAO_RT_Stub *,
-					       stub);
+                                               stub);
 
       CORBA::Policy* policy = rt_stub->client_protocol ();
 
@@ -156,7 +156,7 @@ TAO_RT_Protocols_Hooks::update_client_protocol_properties (TAO_Stub *stub,
 
       if (!CORBA::is_nil (policy))
         {
-	  client_protocols_policy =
+          client_protocols_policy =
             RTCORBA::ClientProtocolPolicy::_narrow (policy
                                                     ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
@@ -177,48 +177,48 @@ TAO_RT_Protocols_Hooks::update_client_protocol_properties (TAO_Stub *stub,
                     {
                       properties =
                         RTCORBA::ProtocolProperties::_narrow (
-							      protocols[j].transport_protocol_properties.in ()
-							      ACE_ENV_ARG_PARAMETER);
+                                                              protocols[j].transport_protocol_properties.in ()
+                                                              ACE_ENV_ARG_PARAMETER);
                       ACE_TRY_CHECK;
 
                       if (ACE_OS::strcmp (protocol_type, "iiop") == 0)
                         break;
                     }
-		}
-	    }
-
-	  if (ACE_OS::strcmp (protocol_type, "iiop") == 0)
-	    {
-	      if (!CORBA::is_nil (properties.in ()))
-		{
-		  RTCORBA::TCPProtocolProperties_var tcp_properties =
-		    RTCORBA::TCPProtocolProperties::_narrow (properties.in ()
-							     ACE_ENV_ARG_PARAMETER);
-		  ACE_TRY_CHECK;
-
-		  int send_buffer_size =
-		    tcp_properties->send_buffer_size (ACE_ENV_SINGLE_ARG_PARAMETER);
-		  ACE_TRY_CHECK;
-		  int recv_buffer_size =
-		    tcp_properties->recv_buffer_size (ACE_ENV_SINGLE_ARG_PARAMETER);
-		  ACE_TRY_CHECK;
-		  int no_delay = tcp_properties->no_delay (ACE_ENV_SINGLE_ARG_PARAMETER);
-		  ACE_TRY_CHECK;
-		  int enable_network_priority =
-		    tcp_properties->enable_network_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
-		  ACE_TRY_CHECK;
-
-		  TAO_IIOP_Connection_Handler *iiop_handler =
-		    ACE_dynamic_cast (TAO_IIOP_Connection_Handler *,
-				      connection_handler);
-
-		  iiop_handler->update_protocol_properties (send_buffer_size,
-							    recv_buffer_size,
-							    no_delay,
-							    enable_network_priority);
-		}
-	    }
-	}
+                }
+            }
+
+          if (ACE_OS::strcmp (protocol_type, "iiop") == 0)
+            {
+              if (!CORBA::is_nil (properties.in ()))
+                {
+                  RTCORBA::TCPProtocolProperties_var tcp_properties =
+                    RTCORBA::TCPProtocolProperties::_narrow (properties.in ()
+                                                             ACE_ENV_ARG_PARAMETER);
+                  ACE_TRY_CHECK;
+
+                  int send_buffer_size =
+                    tcp_properties->send_buffer_size (ACE_ENV_SINGLE_ARG_PARAMETER);
+                  ACE_TRY_CHECK;
+                  int recv_buffer_size =
+                    tcp_properties->recv_buffer_size (ACE_ENV_SINGLE_ARG_PARAMETER);
+                  ACE_TRY_CHECK;
+                  int no_delay = tcp_properties->no_delay (ACE_ENV_SINGLE_ARG_PARAMETER);
+                  ACE_TRY_CHECK;
+                  int enable_network_priority =
+                    tcp_properties->enable_network_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
+                  ACE_TRY_CHECK;
+
+                  TAO_IIOP_Transport *iiop_transport =
+                    ACE_dynamic_cast (TAO_IIOP_Transport *,
+                                      transport);
+
+                  iiop_transport->update_protocol_properties (send_buffer_size,
+                                                              recv_buffer_size,
+                                                              no_delay,
+                                                              enable_network_priority);
+                }
+            }
+        }
     }
   ACE_CATCHANY
     {
@@ -235,25 +235,25 @@ TAO_RT_Protocols_Hooks::update_client_protocol_properties (TAO_Stub *stub,
 
 int
 TAO_RT_Protocols_Hooks::update_server_protocol_properties (CORBA::Policy *policy,
-							   TAO_Connection_Handler *connection_handler,
-							   const char *protocol_type)
+                                                           TAO_Transport *transport,
+                                                           const char *protocol_type)
 {
 
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG,
-		"TAO_RT_Protocols_Hooks::get_effective_server_protocol_properties\n"));
+                "TAO_RT_Protocols_Hooks::get_effective_server_protocol_properties\n"));
 
   ACE_TRY_NEW_ENV
     {
       RTCORBA::ProtocolProperties_var properties =
-	RTCORBA::ProtocolProperties::_nil ();
+        RTCORBA::ProtocolProperties::_nil ();
 
       RTCORBA::ServerProtocolPolicy_var server_protocols_policy;
       TAO_ServerProtocolPolicy *server_protocols = 0;
 
       if (!CORBA::is_nil (policy))
         {
-	  server_protocols_policy =
+          server_protocols_policy =
             RTCORBA::ServerProtocolPolicy::_narrow (policy
                                                     ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
@@ -281,41 +281,41 @@ TAO_RT_Protocols_Hooks::update_server_protocol_properties (CORBA::Policy *policy
                       if (ACE_OS::strcmp (protocol_type, "iiop") == 0)
                         break;
                     }
-		}
-	    }
-
-	  if (ACE_OS::strcmp (protocol_type, "iiop") == 0)
-	    {
-	      if (!CORBA::is_nil (properties.in ()))
-		{
-		  RTCORBA::TCPProtocolProperties_var tcp_properties =
-		    RTCORBA::TCPProtocolProperties::_narrow (properties.in ()
-							     ACE_ENV_ARG_PARAMETER);
-		  ACE_TRY_CHECK;
-
-		  int send_buffer_size =
-		    tcp_properties->send_buffer_size (ACE_ENV_SINGLE_ARG_PARAMETER);
-		  ACE_TRY_CHECK;
-		  int recv_buffer_size =
-		    tcp_properties->recv_buffer_size (ACE_ENV_SINGLE_ARG_PARAMETER);
-		  ACE_TRY_CHECK;
-		  int no_delay = tcp_properties->no_delay (ACE_ENV_SINGLE_ARG_PARAMETER);
-		  ACE_TRY_CHECK;
-		  int enable_network_priority =
-		    tcp_properties->enable_network_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
-		  ACE_TRY_CHECK;
-
-		  TAO_IIOP_Connection_Handler *iiop_handler =
-		    ACE_dynamic_cast (TAO_IIOP_Connection_Handler *,
-				      connection_handler);
-
-		  iiop_handler->update_protocol_properties (send_buffer_size,
-							    recv_buffer_size,
-							    no_delay,
-							    enable_network_priority);
-		}
-	    }
-	}
+                }
+            }
+
+          if (ACE_OS::strcmp (protocol_type, "iiop") == 0)
+            {
+              if (!CORBA::is_nil (properties.in ()))
+                {
+                  RTCORBA::TCPProtocolProperties_var tcp_properties =
+                    RTCORBA::TCPProtocolProperties::_narrow (properties.in ()
+                                                             ACE_ENV_ARG_PARAMETER);
+                  ACE_TRY_CHECK;
+
+                  int send_buffer_size =
+                    tcp_properties->send_buffer_size (ACE_ENV_SINGLE_ARG_PARAMETER);
+                  ACE_TRY_CHECK;
+                  int recv_buffer_size =
+                    tcp_properties->recv_buffer_size (ACE_ENV_SINGLE_ARG_PARAMETER);
+                  ACE_TRY_CHECK;
+                  int no_delay = tcp_properties->no_delay (ACE_ENV_SINGLE_ARG_PARAMETER);
+                  ACE_TRY_CHECK;
+                  int enable_network_priority =
+                    tcp_properties->enable_network_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
+                  ACE_TRY_CHECK;
+
+                  TAO_IIOP_Transport *iiop_transport =
+                    ACE_dynamic_cast (TAO_IIOP_Transport *,
+                                      transport);
+
+                  iiop_transport->update_protocol_properties (send_buffer_size,
+                                                              recv_buffer_size,
+                                                              no_delay,
+                                                              enable_network_priority);
+                }
+            }
+        }
     }
   ACE_CATCHANY
     {
@@ -335,7 +335,7 @@ TAO_RT_Protocols_Hooks::get_dscp_codepoint (void)
 {
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG,
-		"TAO_RT_Protocols_Hooks::get_dscp_codepoint\n"));
+                "TAO_RT_Protocols_Hooks::get_dscp_codepoint\n"));
 
   CORBA::Long codepoint = 0;
 
@@ -346,10 +346,10 @@ TAO_RT_Protocols_Hooks::get_dscp_codepoint (void)
       // for each.
 
       RTCORBA::NetworkPriorityMapping *pm =
-	this->network_mapping_manager_->mapping ();
+        this->network_mapping_manager_->mapping ();
 
       CORBA::Short priority =
-	this->current_->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->current_->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (pm->to_network (priority, codepoint) == 0)
@@ -597,7 +597,7 @@ TAO_RT_Protocols_Hooks::set_thread_native_priority (CORBA::Short native_priority
   ACE_Thread::self (current);
 
   if (ACE_Thread::setprio (current, native_priority) == -1) {
-    ACE_ERROR_RETURN((LM_ERROR, ACE_LIB_TEXT("(%N,%l) Error setting thread priority to %d, errno %d %m\n"), native_priority, errno ), -1); 
+    ACE_ERROR_RETURN((LM_ERROR, ACE_LIB_TEXT("(%N,%l) Error setting thread priority to %d, errno %d %m\n"), native_priority, errno ), -1);
   }
 
   return 0;
@@ -639,14 +639,14 @@ TAO_RT_Protocols_Hooks::set_default_policies (ACE_ENV_SINGLE_ARG_DECL)
   // Set ServerProtocolPolicy.
   TAO_ServerProtocolPolicy *server_protocol_policy = 0;
   ACE_NEW_RETURN (server_protocol_policy,
-		  TAO_ServerProtocolPolicy (protocols),
+                  TAO_ServerProtocolPolicy (protocols),
                   -1);
 
   RTCORBA::ServerProtocolPolicy_var safe_server_protocol_policy =
     server_protocol_policy;
 
   this->orb_core_->get_default_policies ()->set_policy (server_protocol_policy
-							ACE_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Set ClientProtocolPolicy.
diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.h b/TAO/tao/RTCORBA/RT_Protocols_Hooks.h
index 32fedf30e00..e1d48e0c16c 100644
--- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.h
+++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.h
@@ -47,17 +47,17 @@ public:
    * @param tcp_properties returns the Protocol List set
    */
   virtual int call_client_protocols_hook (int &send_buffer_size,
-					  int &recv_buffer_size,
-					  int &no_delay,
-					  int &enable_network_priority,
-					  const char *protocol_type);
+                                          int &recv_buffer_size,
+                                          int &no_delay,
+                                          int &enable_network_priority,
+                                          const char *protocol_type);
 
   /// Define the Client_Protocols_TCP_Hook signature
   typedef int (*Client_Protocols_Hook) (TAO_ORB_Core *,
                                         int &send_buffer_size,
                                         int &recv_buffer_size,
                                         int &no_delay,
-					int &enable_network_priority,
+                                        int &enable_network_priority,
                                         const char *);
 
   static void set_client_protocols_hook (Client_Protocols_Hook hook);
@@ -75,7 +75,7 @@ public:
   virtual int call_server_protocols_hook (int &send_buffer_size,
                                           int &recv_buffer_size,
                                           int &no_delay,
-					  int &enable_network_priority,
+                                          int &enable_network_priority,
                                           const char *protocol_type);
 
   /// Define the Server_Protocols_Hook signature
@@ -83,7 +83,7 @@ public:
                                         int &,
                                         int &,
                                         int &,
-					int &,
+                                        int &,
                                         const char *);
 
   static void set_server_protocols_hook (Server_Protocols_Hook hook);
@@ -92,31 +92,16 @@ public:
   /// The hook to be set for the ServerProtocolPolicy.
   static Server_Protocols_Hook server_protocols_hook_;
 
-/*
-  virtual int get_effective_client_protocol_properties (TAO_Stub *stub,
-							int &send_buffer_size,
-							int &recv_buffer_size,
-							int &no_delay,
-							int &enable_network_priority,
-							const char *protocol_type);
-
-  virtual int get_effective_server_protocol_properties (TAO_Adpater *poa,
-							int &send_buffer_size,
-							int &recv_buffer_size,
-							int &no_delay,
-							int &enable_network_priority,
-							const char *protocol_type);
 
-  */
 
   virtual int update_client_protocol_properties (TAO_Stub *stub,
-							TAO_Connection_Handler * connection_handler,
-							const char *protocol_type);
+                                                 TAO_Transport *t,
+                                                 const char *protocol_type);
 
 
   virtual int update_server_protocol_properties (CORBA::Policy *server_policy,
-							TAO_Connection_Handler * connection_handler,
-							const char *protocol_type);
+                                                 TAO_Transport *t,
+                                                 const char *protocol_type);
 
   virtual CORBA::Long get_dscp_codepoint (void);
 
@@ -191,15 +176,3 @@ ACE_FACTORY_DECLARE (TAO_RTCORBA, TAO_RT_Protocols_Hooks)
 
 #include "ace/post.h"
 #endif /* TAO_RT_PROTOCOLS_HOOKS_H */
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
index b423dd4f8c8..69e348a6d1b 100644
--- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
+++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
@@ -75,20 +75,13 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request (
 
   if (req.transport ()->tag () == IOP::TAG_INTERNET_IOP)
     {
-      const char protocol [] = "iiop";
-      const char *protocol_type = protocol;
-
-      TAO_IIOP_Transport *iiop_transport =
-        ACE_dynamic_cast (TAO_IIOP_Transport *,
-                          req.transport ());
-
       CORBA::Policy_var policy = poa.server_protocol ();
 
       int result =
         tph->update_server_protocol_properties (
           policy,
-          iiop_transport-> connection_handler_i (),
-          protocol_type);
+          req.transport (),
+          "iiop");
 
       if (result != 0)
         ACE_ERROR((LM_ERROR,
diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp
index ddcc8568985..3a57b674988 100644
--- a/TAO/tao/Stub.cpp
+++ b/TAO/tao/Stub.cpp
@@ -92,16 +92,6 @@ TAO_Stub::~TAO_Stub (void)
 
   if (this->profile_in_use_ != 0)
     {
-      if (this->orb_->orb_core () != 0)
-        {
-          // The hint in the profile is a hint for a client connection
-          // handler.  If the ORB core doesn't exist, perhaps due to
-          // it being destroy()ed, then no connectors exist so do not
-          // reset the hint in case it points to non-existent
-          // connection handler.
-          TAO_Endpoint* ep = this->profile_in_use_->endpoint ();
-        }
-
       // decrease reference count on profile
       this->profile_in_use_->_decr_refcnt ();
       this->profile_in_use_ = 0;
author	bala <balanatarajan@users.noreply.github.com>	2003-06-07 19:33:43 +0000
committer	bala <balanatarajan@users.noreply.github.com>	2003-06-07 19:33:43 +0000
commit	1f2cf094be7353f78c29ddb1dfc75f39f4f8b9ae (patch)
tree	da8e895d6dc7bb944ad491ba6ff6de8ad708fa32
parent	d09b3386036f10ae2279c6c1f0af3a626283b2c4 (diff)
download	ATCD-1f2cf094be7353f78c29ddb1dfc75f39f4f8b9ae.tar.gz