summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2004-10-04 12:36:48 +0000
committerbala <balanatarajan@users.noreply.github.com>2004-10-04 12:36:48 +0000
commitf1c82b730dafd5cb73e74dd7f043411b72655e00 (patch)
tree4063bc06b93896cfabbc56172dec165ec345607d
parentc53e11224b9091ebf6816259c2a9cd5f6a58a0de (diff)
downloadATCD-f1c82b730dafd5cb73e74dd7f043411b72655e00.tar.gz
ChangeLogTag:Mon Oct 4 12:32:05 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
-rw-r--r--TAO/ChangeLog13
-rw-r--r--TAO/tao/Transport_Cache_Manager.cpp16
-rw-r--r--TAO/tao/default_resource.cpp2
3 files changed, 22 insertions, 9 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 8696528e0e5..b250fa88053 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,16 @@
+Mon Oct 4 12:32:05 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
+
+ * tao/Transport_Cache_Manager.cpp:
+
+ Use the ORBConnectionCacheMax value within the transport cache
+ manager. Added an extra check to disallow setting the value to
+ 0. Thanks to Vladislav Zverev <vladislav at gtss dot spb dot ru>
+ for reporting the problem.
+
+ * tao/default_resource.cpp:
+
+ Cosmetic fix.
+
Mon Oct 4 11:59:43 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
* orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp:
diff --git a/TAO/tao/Transport_Cache_Manager.cpp b/TAO/tao/Transport_Cache_Manager.cpp
index 94e937d3947..dbeaa8552d3 100644
--- a/TAO/tao/Transport_Cache_Manager.cpp
+++ b/TAO/tao/Transport_Cache_Manager.cpp
@@ -19,14 +19,14 @@ ACE_RCSID (tao,
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_ (static_cast<size_t> (ACE::max_handles ())),
- condition_ (0),
- cache_lock_ (0),
- muxed_number_ (orb_core.resource_factory ()->max_muxed_connections ()),
- no_waiting_threads_ (0),
- last_entry_returned_ (0)
+ : percent_ (orb_core.resource_factory ()->purge_percentage ())
+ , purging_strategy_ (orb_core.resource_factory ()->create_purging_strategy ())
+ , cache_map_ (orb_core.resource_factory ()->cache_maximum ())
+ , condition_ (0)
+ , cache_lock_ (0)
+ , muxed_number_ (orb_core.resource_factory ()->max_muxed_connections ())
+ , no_waiting_threads_ (0)
+ , last_entry_returned_ (0)
{
if (orb_core.resource_factory ()->locked_transport_cache ())
{
diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp
index 476b89743f2..a818bf28393 100644
--- a/TAO/tao/default_resource.cpp
+++ b/TAO/tao/default_resource.cpp
@@ -973,7 +973,7 @@ TAO_Default_Resource_Factory::create_purging_strategy (void)
{
ACE_NEW_RETURN (strategy,
TAO_LRU_Connection_Purging_Strategy (
- this->cache_maximum ()),
+ this->cache_maximum ()),
0);
}
else