ChangeLogTag: Mon Sep 17 19:00:00 2001 Irfan Pyarali <irfan@cs.wustl.edu>

1 files changed, 4 insertions, 33 deletions

diff --git a/TAO/tao/Transport_Cache_Manager.cpp b/TAO/tao/Transport_Cache_Manager.cpp
index 8056d2f26b1..e6887fd19cf 100644
--- a/TAO/tao/Transport_Cache_Manager.cpp
+++ b/TAO/tao/Transport_Cache_Manager.cpp
@@ -18,17 +18,14 @@ ACE_RCSID (TAO,
            Transport_Cache_Manager,
            "$Id$")
 
-
-TAO_Transport_Cache_Manager::TAO_Transport_Cache_Manager (
-                                         TAO_Resource_Factory* rf)
-  : percent_ (rf->purge_percentage ()),
-    purging_strategy_ (rf->create_purging_strategy ()),
+TAO_Transport_Cache_Manager::TAO_Transport_Cache_Manager (TAO_ORB_Core &orb_core)
+  : percent_ (orb_core.resource_factory ()->purge_percentage ()),
+    purging_strategy_ (orb_core.resource_factory ()->create_purging_strategy ()),
     cache_map_ (),
-    cache_lock_ (0)
+    cache_lock_ (orb_core.resource_factory ()->create_cached_connection_lock ())
 {
 }
 
-
 TAO_Transport_Cache_Manager::~TAO_Transport_Cache_Manager (void)
 {
   // Delete the lock that we have
@@ -39,32 +36,6 @@ TAO_Transport_Cache_Manager::~TAO_Transport_Cache_Manager (void)
 }
 
 int
-TAO_Transport_Cache_Manager::open (TAO_ORB_Core *orb_core,
-                                    size_t size)
-{
-  if (this->purging_strategy_ == 0)
-    {
-      return -1;
-    }
-
-  // Create the cache_lock
-  this->cache_lock_ =
-    orb_core->resource_factory ()->create_cached_connection_lock ();
-
-  if (this->cache_lock_ == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("TAO (%P|%t) ERROR TAO_Transport_Cache_Manager::open: "),
-                         ACE_TEXT ("Lock creation error\n")),
-                        -1);
-    }
-
-  // Now open the cache map
-  return this->cache_map_.open (size);
-}
-
-
-int
 TAO_Transport_Cache_Manager::bind_i (TAO_Cache_ExtId &ext_id,
                                      TAO_Cache_IntId &int_id)
 {