More Thread_Pool deltas

16 files changed, 61 insertions, 138 deletions

diff --git a/TAO/tao/Acceptor_Impl.cpp b/TAO/tao/Acceptor_Impl.cpp
index 208ee97a8bc..11e0a966b29 100644
--- a/TAO/tao/Acceptor_Impl.cpp
+++ b/TAO/tao/Acceptor_Impl.cpp
@@ -30,6 +30,7 @@
 #include "tao/Server_Strategy_Factory.h"
 #include "tao/Connector_Registry.h"
 #include "tao/Transport_Cache_Manager.h"
+#include "tao/Thread_Lane_Resources.h"
 
 #include "ace/Object_Manager.h"
 
@@ -58,7 +59,7 @@ TAO_Creation_Strategy<SVC_HANDLER>::make_svc_handler (SVC_HANDLER *&sh)
   if (sh == 0)
     {
       // Purge connections (if necessary)
-      this->orb_core_->transport_cache ()->purge ();
+      this->orb_core_->lane_resources ().transport_cache ().purge ();
 
       ACE_NEW_RETURN (sh,
                       SVC_HANDLER (this->orb_core_,
diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp
index c05a558efd3..66ca33b6990 100644
--- a/TAO/tao/IIOP_Connection_Handler.cpp
+++ b/TAO/tao/IIOP_Connection_Handler.cpp
@@ -11,6 +11,7 @@
 #include "tao/IIOP_Transport.h"
 #include "tao/IIOP_Endpoint.h"
 #include "tao/Transport_Cache_Manager.h"
+#include "tao/Thread_Lane_Resources.h"
 #include "tao/Base_Transport_Property.h"
 
 #if !defined (__ACE_INLINE__)
@@ -267,8 +268,8 @@ TAO_IIOP_Connection_Handler::add_transport_to_cache (void)
   TAO_Base_Transport_Property prop (&endpoint);
 
   // Add the handler to Cache
-  return this->orb_core ()->transport_cache ()->cache_transport (&prop,
-                                                                 this->transport ());
+  return this->orb_core ()->lane_resources ().transport_cache ().cache_transport (&prop,
+                                                                                  this->transport ());
 }
 
 int
diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp
index 0561c25189a..d7f20575897 100644
--- a/TAO/tao/IIOP_Connector.cpp
+++ b/TAO/tao/IIOP_Connector.cpp
@@ -11,6 +11,7 @@
 #include "tao/Base_Transport_Property.h"
 #include "tao/Protocols_Hooks.h"
 #include "tao/Transport_Cache_Manager.h"
+#include "tao/Thread_Lane_Resources.h"
 #include "ace/Strategies_T.h"
 
 ACE_RCSID (TAO,
@@ -156,8 +157,8 @@ TAO_IIOP_Connector::connect (TAO_Transport_Descriptor_Interface *desc,
 
   // Check the Cache first for connections
   // If transport found, reference count is incremented on assignment
-  if (this->orb_core ()->transport_cache ()->find_transport (desc,
-                                                             base_transport) == 0)
+  if (this->orb_core ()->lane_resources ().transport_cache ().find_transport (desc,
+                                                                              base_transport) == 0)
     {
       if (TAO_debug_level > 2)
         ACE_DEBUG ((LM_DEBUG,
@@ -173,7 +174,7 @@ TAO_IIOP_Connector::connect (TAO_Transport_Descriptor_Interface *desc,
                     ACE_TEXT ("making a new connection\n")));
 
       // Purge connections (if necessary)
-      this->orb_core ()->transport_cache ()->purge ();
+      this->orb_core ()->lane_resources ().transport_cache ().purge ();
 
       // @@ This needs to change in the next round when we implement a
       // policy that will not allow new connections when a connection
@@ -225,8 +226,8 @@ TAO_IIOP_Connector::connect (TAO_Transport_Descriptor_Interface *desc,
       base_transport = TAO_Transport::_duplicate (svc_handler->transport ());
       // Add the handler to Cache
       int retval =
-        this->orb_core ()->transport_cache ()->cache_transport (desc,
-                                                                base_transport);
+        this->orb_core ()->lane_resources ().transport_cache ().cache_transport (desc,
+                                                                                 base_transport);
 
       if (retval != 0 && TAO_debug_level > 0)
         {
@@ -371,8 +372,8 @@ TAO_IIOP_Connector::preconnect (const char *preconnects)
 
               // Add the handler to Cache
               int retval =
-                this->orb_core ()->transport_cache ()->cache_transport (&prop,
-                                                                        handlers[slot]->transport ());
+                this->orb_core ()->lane_resources ().transport_cache ().cache_transport (&prop,
+                                                                                         handlers[slot]->transport ());
               successes++;
 
               if (retval != 0 && TAO_debug_level > 4)
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index 500632500f0..5acb8ddc297 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -13,7 +13,6 @@
 #include "Stub.h"
 #include "Reactor_Registry.h"
 #include "Leader_Follower.h"
-#include "Transport_Cache_Manager.h"
 #include "Connector_Registry.h"
 #include "Acceptor_Registry.h"
 
@@ -173,7 +172,6 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid)
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
     ior_interceptors_ (),
     parser_registry_ (),
-    transport_cache_ (0),
     bidir_adapter_ (0),
     bidir_giop_policy_ (0),
     flushing_strategy_ (0),
@@ -217,7 +215,6 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid)
 TAO_ORB_Core::~TAO_ORB_Core (void)
 {
   delete this->flushing_strategy_;
-  delete this->transport_cache_;
 
   ACE_OS::free (this->orbid_);
 
@@ -1035,11 +1032,6 @@ TAO_ORB_Core::init (int &argc, char *argv[], CORBA::Environment &ACE_TRY_ENV)
   // Initialize the flushing strategy
   this->flushing_strategy_ = trf->create_flushing_strategy ();
 
-  // Create the purging strategy
-  ACE_NEW_RETURN (this->transport_cache_,
-                  TAO_Transport_Cache_Manager (*this),
-                  -1);
-
   // Now that we have a complete list of available protocols and their
   // related factory objects, set default policies and initialize the
   // registries!
@@ -1150,42 +1142,8 @@ TAO_ORB_Core::fini (void)
 
   // Finalize lane resources.
   this->thread_lane_resources_manager ()->finalize ();
+  delete this->thread_lane_resources_manager_;
 
-  // Set of file descriptors corresponding to open connections.  This
-  // handle set is used to explicitly deregister the connection event
-  // handlers from the Reactor.  This is particularly important for
-  // dynamically loaded ORBs where an application level reactor, such
-  // as the Singleton reactor, is used instead of an ORB created one.
-
-  ACE_Handle_Set handle_set;
-  TAO_EventHandlerSet unregistered;
-
-  // Close the transport cache and return the handle set that needs
-  // to be de-registered from the reactor.
-  if (this->transport_cache_ != 0)
-    {
-      this->transport_cache_->close (handle_set, unregistered);
-    }
-
-  // Shutdown all open connections that are registered with the ORB
-  // Core.  Note that the ACE_Event_Handler::DONT_CALL mask is NOT
-  // used here since the reactor should invoke each handle's
-  // corresponding ACE_Event_Handler::handle_close() method to ensure
-  // that the connection is shutdown gracefully prior to destroying
-  // the ORB Core.
-  if (handle_set.num_set () > 0)
-    (void) this->reactor ()->remove_handler (handle_set,
-                                             ACE_Event_Handler::ALL_EVENTS_MASK);
-  if (!unregistered.is_empty ())
-    {
-      ACE_Event_Handler** eh;
-      for (TAO_EventHandlerSetIterator iter(unregistered);
-           iter.next (eh); iter.advance())
-        {
-          (*eh)->handle_close (ACE_INVALID_HANDLE,
-                               ACE_Event_Handler::ALL_EVENTS_MASK);
-        }
-    }
   // Pass reactor back to the resource factory.
   if (this->resource_factory_ != 0)
     this->resource_factory_->reclaim_reactor (this->reactor_);
@@ -1386,13 +1344,13 @@ TAO_ORB_Core::thread_lane_resources_manager (void)
                       TAO_Default_Thread_Lane_Resources_Manager,
                       0);
 
-      // Initialize the resources.
-      thread_lane_resources_manager->initialize (*this);
-
       // Store a copy for later use.
       this->thread_lane_resources_manager_ = thread_lane_resources_manager;
     }
 
+  // Initialize the resources.
+  this->thread_lane_resources_manager_->initialize (*this);
+
   return this->thread_lane_resources_manager_;
 }
 
@@ -2926,40 +2884,13 @@ TAO_ORB_Core::create_data_block_i (size_t size,
 ACE_Reactor *
 TAO_ORB_Core::reactor (void)
 {
-  if (this->reactor_registry_ != 0)
-    return this->reactor_registry_->reactor ();
-
-  if (this->reactor_ == 0)
-    {
-      // Double checked locking
-      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
-      if (this->reactor_ == 0)
-        {
-          this->reactor_ =
-            this->resource_factory ()->get_reactor ();
-        }
-    }
-  return this->reactor_;
+  return this->reactor_registry_->reactor ();
 }
 
 ACE_Reactor *
 TAO_ORB_Core::reactor (TAO_Acceptor *acceptor)
 {
-  if (this->reactor_registry_ != 0)
-    return this->reactor_registry_->reactor (acceptor);
-
-  // @@ ????
-  if (this->reactor_ == 0)
-    {
-      // Double checked locking
-      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
-      if (this->reactor_ == 0)
-        {
-          this->reactor_ =
-            this->resource_factory ()->get_reactor ();
-        }
-    }
-  return this->reactor_;
+  return this->reactor_registry_->reactor (acceptor);
 }
 
 CORBA::Object_ptr
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
index 2b5bb9d432a..cf409ee795f 100644
--- a/TAO/tao/ORB_Core.h
+++ b/TAO/tao/ORB_Core.h
@@ -874,9 +874,6 @@ public:
   /// otherwise 0.
   int open (CORBA::Environment &ACE_TRY_ENV);
 
-  /// Return the underlying transport cache
-  TAO_Transport_Cache_Manager *transport_cache (void);
-
   /// Call the bidir_giop library to parse the policy.
   int parse_bidir_policy (CORBA::Policy_ptr policy,
                           CORBA::Environment &ACE_TRY_ENV);
@@ -1266,9 +1263,6 @@ protected:
   /// The IOR parser registry.
   TAO_Parser_Registry parser_registry_;
 
-  /// TAO's connection cache
-  TAO_Transport_Cache_Manager *transport_cache_;
-
   /// BiDirectional GIOP factory
   TAO_BiDir_Adapter *bidir_adapter_;
 
diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i
index 00789a5194d..5b4518161dc 100644
--- a/TAO/tao/ORB_Core.i
+++ b/TAO/tao/ORB_Core.i
@@ -31,12 +31,6 @@ TAO_ORB_Core::locking_strategy (void)
   return 0;
 }
 
-ACE_INLINE TAO_Transport_Cache_Manager *
-TAO_ORB_Core::transport_cache (void)
-{
-  return this->transport_cache_;
-}
-
 ACE_INLINE CORBA::Boolean
 TAO_ORB_Core::bidir_giop_policy (void)
 {
diff --git a/TAO/tao/RTPortableServer/RT_POA.cpp b/TAO/tao/RTPortableServer/RT_POA.cpp
index d41a40e66a8..eff96c88cfd 100644
--- a/TAO/tao/RTPortableServer/RT_POA.cpp
+++ b/TAO/tao/RTPortableServer/RT_POA.cpp
@@ -152,10 +152,10 @@ TAO_RT_POA::valid_priority (RTCORBA::Priority priority,
   else
     // Case 2.
     {
-      TAO_Acceptor_Registry *ar =
-        this->orb_core_.acceptor_registry ();
+      TAO_Acceptor_Registry &ar =
+        this->orb_core_.lane_resources ().acceptor_registry ();
 
-      for (TAO_Acceptor **a = ar->begin (); a != ar->end (); ++a)
+      for (TAO_Acceptor **a = ar.begin (); a != ar.end (); ++a)
         {
           if ((*a)->priority () == priority)
             return;
diff --git a/TAO/tao/Single_Reactor.cpp b/TAO/tao/Single_Reactor.cpp
index 242f11526f1..e6bad3c7da3 100644
--- a/TAO/tao/Single_Reactor.cpp
+++ b/TAO/tao/Single_Reactor.cpp
@@ -4,6 +4,7 @@
 #include "tao/ORB_Core.h"
 #include "tao/Resource_Factory.h"
 #include "tao/Leader_Follower.h"
+#include "tao/Thread_Lane_Resources.h"
 #include "ace/Reactor.h"
 
 #if !defined (__ACE_INLINE__)
@@ -12,23 +13,24 @@
 
 ACE_RCSID(tao, Single_Reactor, "$Id$")
 
+TAO_Single_Reactor::TAO_Single_Reactor (void)
+{
+}
+
 TAO_Single_Reactor::~TAO_Single_Reactor (void)
 {
-  delete this->leader_follower_;
 }
 
 void
 TAO_Single_Reactor::open (TAO_ORB_Core *orb_core)
 {
   this->TAO_Reactor_Registry::open (orb_core);
-  ACE_NEW (this->leader_follower_,
-           TAO_Leader_Follower (this->orb_core ()));
 }
 
 ACE_Reactor *
 TAO_Single_Reactor::reactor (void)
 {
-  return this->leader_follower_->reactor ();
+  return this->leader_follower ().reactor ();
 }
 
 ACE_Reactor *
@@ -40,13 +42,13 @@ TAO_Single_Reactor::reactor (TAO_Acceptor *)
 TAO_Leader_Follower &
 TAO_Single_Reactor::leader_follower (void)
 {
-  return *this->leader_follower_;
+  return this->orb_core ()->lane_resources ().leader_follower ();
 }
 
 TAO_Leader_Follower &
 TAO_Single_Reactor::leader_follower (TAO_Acceptor *)
 {
-  return *this->leader_follower_;
+  return this->leader_follower ();
 }
 
 void
diff --git a/TAO/tao/Single_Reactor.h b/TAO/tao/Single_Reactor.h
index 7cb88d60a8b..96d925aa63d 100644
--- a/TAO/tao/Single_Reactor.h
+++ b/TAO/tao/Single_Reactor.h
@@ -53,8 +53,6 @@ public:
   virtual int shutdown_all (void);
 
 private:
-  /// The leader follower
-  TAO_Leader_Follower *leader_follower_;
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/Single_Reactor.i b/TAO/tao/Single_Reactor.i
index 073a813d569..cfa1da318d3 100644
--- a/TAO/tao/Single_Reactor.i
+++ b/TAO/tao/Single_Reactor.i
@@ -1,6 +1 @@
 // $Id$
-
-ACE_INLINE
-TAO_Single_Reactor::TAO_Single_Reactor (void)
-{
-}
diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
index fd7fb9db6e6..efe7cc832b1 100644
--- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
@@ -15,6 +15,7 @@
 #include "tao/Server_Strategy_Factory.h"
 #include "tao/Base_Transport_Property.h"
 #include "tao/Transport_Cache_Manager.h"
+#include "tao/Thread_Lane_Resources.h"
 #include "SHMIOP_Endpoint.h"
 
 #if !defined (__ACE_INLINE__)
@@ -243,8 +244,8 @@ TAO_SHMIOP_Connection_Handler::add_transport_to_cache (void)
   TAO_Base_Transport_Property prop (&endpoint);
 
   // Add the handler to Cache
-  return this->orb_core ()->transport_cache ()->cache_transport (&prop,
-                                                                 this->transport ());
+  return this->orb_core ()->lane_resources ().transport_cache ().cache_transport (&prop,
+                                                                                  this->transport ());
 }
 
 
diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp
index 0a80bc80dcb..2ce15500d26 100644
--- a/TAO/tao/Strategies/SHMIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp
@@ -14,6 +14,7 @@
 #include "tao/Environment.h"
 #include "ace/Auto_Ptr.h"
 #include "tao/Transport_Cache_Manager.h"
+#include "tao/Thread_Lane_Resources.h"
 
 ACE_RCSID (Strategies,
            SHMIOP_Connector,
@@ -164,8 +165,8 @@ TAO_SHMIOP_Connector::connect (TAO_Transport_Descriptor_Interface *desc,
 
   // Check the Cache first for connections
   // If transport found, reference count is incremented on assignment
-  if (this->orb_core ()->transport_cache ()->find_transport (desc,
-                                                             base_transport) == 0)
+  if (this->orb_core ()->lane_resources ().transport_cache ().find_transport (desc,
+                                                                              base_transport) == 0)
     {
       if (TAO_debug_level > 5)
         ACE_DEBUG ((LM_DEBUG,
@@ -181,7 +182,7 @@ TAO_SHMIOP_Connector::connect (TAO_Transport_Descriptor_Interface *desc,
                     ACE_TEXT ("making a new connection \n")));
 
       // Purge connections (if necessary)
-      this->orb_core ()->transport_cache ()->purge ();
+      this->orb_core ()->lane_resources ().transport_cache ().purge ();
 
       // @@ This needs to change in the next round when we implement a
       // policy that will not allow new connections when a connection
@@ -235,8 +236,8 @@ TAO_SHMIOP_Connector::connect (TAO_Transport_Descriptor_Interface *desc,
       base_transport = TAO_Transport::_duplicate (svc_handler->transport ());
       // Add the handler to Cache
       int retval =
-        this->orb_core ()->transport_cache ()->cache_transport (desc,
-                                                                svc_handler->transport ());
+        this->orb_core ()->lane_resources ().transport_cache ().cache_transport (desc,
+                                                                                 svc_handler->transport ());
 
       if (retval != 0 && TAO_debug_level > 0)
         {
@@ -368,8 +369,8 @@ TAO_SHMIOP_Connector::preconnect (const char *preconnects)
 
               // Add the handler to Cache
               int retval =
-                this->orb_core ()->transport_cache ()->cache_transport (&prop,
-                                                                        handlers[slot]->transport ());
+                this->orb_core ()->lane_resources ().transport_cache ().cache_transport (&prop,
+                                                                                         handlers[slot]->transport ());
               successes++;
 
               if (retval != 0 && TAO_debug_level > 4)
diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
index 4d412f7c870..d331f4e1daa 100644
--- a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
@@ -16,6 +16,7 @@
 #include "tao/Base_Transport_Property.h"
 #include "tao/GIOP_Message_Lite.h"
 #include "tao/Transport_Cache_Manager.h"
+#include "tao/Thread_Lane_Resources.h"
 
 #if !defined (__ACE_INLINE__)
 # include "UIOP_Connection_Handler.inl"
@@ -218,8 +219,8 @@ TAO_UIOP_Connection_Handler::add_transport_to_cache (void)
   TAO_Base_Transport_Property prop (&endpoint);
 
   // Add the handler to Cache
-  return this->orb_core ()->transport_cache ()->cache_transport (&prop,
-                                                                 this->transport ());
+  return this->orb_core ()->lane_resources ().transport_cache ().cache_transport (&prop,
+                                                                                  this->transport ());
 }
 
 
diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp
index 23483cb8422..089b8d737e0 100644
--- a/TAO/tao/Strategies/UIOP_Connector.cpp
+++ b/TAO/tao/Strategies/UIOP_Connector.cpp
@@ -14,6 +14,7 @@
 #include "tao/Protocols_Hooks.h"
 #include "tao/Base_Transport_Property.h"
 #include "tao/Transport_Cache_Manager.h"
+#include "tao/Thread_Lane_Resources.h"
 
 ACE_RCSID(Strategies, UIOP_Connector, "$Id$")
 
@@ -154,8 +155,8 @@ TAO_UIOP_Connector::connect (TAO_Transport_Descriptor_Interface *desc,
 
   // Check the Cache first for connections
   // If transport found, reference count is incremented on assignment
-  if (this->orb_core ()->transport_cache ()->find_transport (desc,
-                                                             base_transport) == 0)
+  if (this->orb_core ()->lane_resources ().transport_cache ().find_transport (desc,
+                                                                              base_transport) == 0)
     {
       if (TAO_debug_level > 5)
         ACE_DEBUG ((LM_DEBUG,
@@ -171,7 +172,7 @@ TAO_UIOP_Connector::connect (TAO_Transport_Descriptor_Interface *desc,
                     ACE_TEXT ("making a new connection \n")));
 
       // Purge connections (if necessary)
-      this->orb_core ()->transport_cache ()->purge ();
+      this->orb_core ()->lane_resources ().transport_cache ().purge ();
 
       // @@ This needs to change in the next round when we implement a
       // policy that will not allow new connections when a connection
@@ -221,8 +222,8 @@ TAO_UIOP_Connector::connect (TAO_Transport_Descriptor_Interface *desc,
       base_transport = TAO_Transport::_duplicate (svc_handler->transport ());
       // Add the handler to Cache
       int retval =
-        this->orb_core ()->transport_cache ()->cache_transport (desc,
-                                                                base_transport);
+        this->orb_core ()->lane_resources ().transport_cache ().cache_transport (desc,
+                                                                                 base_transport);
 
       if (retval != 0 && TAO_debug_level > 0)
         {
@@ -342,8 +343,8 @@ TAO_UIOP_Connector::preconnect (const char *preconnects)
 
               // Add the handler to Cache
               int retval =
-                this->orb_core ()->transport_cache ()->cache_transport (&prop,
-                                                                        handlers[slot]->transport ());
+                this->orb_core ()->lane_resources ().transport_cache ().cache_transport (&prop,
+                                                                                         handlers[slot]->transport ());
               ++successes;
 
               if (retval != 0 && TAO_debug_level > 4)
diff --git a/TAO/tao/Thread_Lane_Resources.cpp b/TAO/tao/Thread_Lane_Resources.cpp
index 274c213a4b8..ae881a0c973 100644
--- a/TAO/tao/Thread_Lane_Resources.cpp
+++ b/TAO/tao/Thread_Lane_Resources.cpp
@@ -28,6 +28,7 @@ TAO_Thread_Lane_Resources::TAO_Thread_Lane_Resources (TAO_ORB_Core &orb_core)
 TAO_Thread_Lane_Resources::~TAO_Thread_Lane_Resources (void)
 {
   delete this->transport_cache_;
+  delete this->leader_follower_;
 }
 
 TAO_Transport_Cache_Manager &
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index eff531ec2df..fb86a43d514 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -16,6 +16,7 @@
 #include "Asynch_Queued_Message.h"
 #include "Flushing_Strategy.h"
 #include "Transport_Cache_Manager.h"
+#include "Thread_Lane_Resources.h"
 #include "debug.h"
 
 #include "ace/Message_Block.h"
@@ -115,7 +116,7 @@ TAO_Transport::~TAO_Transport (void)
     // outside the TAO_Transport.
     if (this->cache_map_entry_ != 0)
       {
-        this->orb_core_->transport_cache ()->purge_entry (
+        this->orb_core_->lane_resources ().transport_cache ().purge_entry (
           this->cache_map_entry_);
       }
 }
@@ -619,12 +620,12 @@ int
 TAO_Transport::recache_transport (TAO_Transport_Descriptor_Interface *desc)
 {
   // First purge our entry
-  this->orb_core_->transport_cache ()->purge_entry (
+  this->orb_core_->lane_resources ().transport_cache ().purge_entry (
     this->cache_map_entry_);
 
   // Then add ourselves to the cache
-  return this->orb_core_->transport_cache ()->cache_transport (desc,
-                                                               this);
+  return this->orb_core_->lane_resources ().transport_cache ().cache_transport (desc,
+                                                                                this);
 }
 
 void
@@ -633,7 +634,7 @@ TAO_Transport::mark_invalid (void)
   // @@ Do we need this method at all??
   if (this->cache_map_entry_ != 0)
     {
-      this->orb_core_->transport_cache ()->mark_invalid (
+      this->orb_core_->lane_resources ().transport_cache ().mark_invalid (
         this->cache_map_entry_);
     }
 }
@@ -643,7 +644,7 @@ TAO_Transport::make_idle (void)
 {
   if (this->cache_map_entry_ != 0)
     {
-      return this->orb_core_->transport_cache ()->make_idle (
+      return this->orb_core_->lane_resources ().transport_cache ().make_idle (
                this->cache_map_entry_);
     }
   return -1;
@@ -657,7 +658,7 @@ TAO_Transport::close_connection (void)
   // Purge the entry
   if (this->cache_map_entry_ != 0)
     {
-      this->orb_core_->transport_cache ()->purge_entry (
+      this->orb_core_->lane_resources ().transport_cache ().purge_entry (
         this->cache_map_entry_);
     }
 }