summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2002-11-29 16:44:55 +0000
committerbala <balanatarajan@users.noreply.github.com>2002-11-29 16:44:55 +0000
commitea55fc5113cdcabf4e63adf9c9f1c75e64de1ea1 (patch)
tree710dc803cb49259d55b888fb54757f774d16202f
parentd452c32bfe97e3e3f492e824dcbbb3e8741977b2 (diff)
downloadATCD-ea55fc5113cdcabf4e63adf9c9f1c75e64de1ea1.tar.gz
ChangeLogTag: Fri Nov 29 11:42:45 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
-rw-r--r--TAO/ChangeLog8
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp9
-rw-r--r--TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp7
-rw-r--r--TAO/tao/Strategies/UIOP_Connection_Handler.cpp7
4 files changed, 23 insertions, 8 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index ddd05aa1ec6..44d0bcd5707 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Fri Nov 29 11:42:45 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
+
+ * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp:
+ * tao/Strategies/SHMIOP_Connection_Handler.cpp:
+ * tao/Strategies/UIOP_Connection_Handler.cpp: Cache and idle the
+ transport in add_transport_to_cache () instead of just caching
+ and leaving the transport in busy state.
+
Fri Nov 29 11:16:28 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
This set of fixes are for fixing BUG 1247. Please see
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
index d6406eb84de..d5150aa9612 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
@@ -283,11 +283,12 @@ TAO_SSLIOP_Connection_Handler::add_transport_to_cache (void)
// Construct a property object
TAO_Base_Transport_Property prop (&endpoint);
+ TAO_Transport_Cache_Manager &cache =
+ this->orb_core ()->lane_resources ().transport_cache ();
+
// Add the handler to Cache
- return
- this->orb_core ()->lane_resources ().transport_cache ().cache_transport (
- &prop,
- this->transport ());
+ return cache.cache_idle_transport (&prop,
+ this->transport ());
}
int
diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
index a419525fd1e..d49921c9ace 100644
--- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
@@ -216,9 +216,12 @@ TAO_SHMIOP_Connection_Handler::add_transport_to_cache (void)
// Construct a property object
TAO_Base_Transport_Property prop (&endpoint);
+ TAO_Transport_Cache_Manager &cache =
+ this->orb_core ()->lane_resources ().transport_cache ();
+
// Add the handler to Cache
- return this->orb_core ()->lane_resources ().transport_cache ().cache_transport (&prop,
- this->transport ());
+ return cache.cache_idle_transport (&prop,
+ this->transport ());
}
// ****************************************************************
diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
index 51e02d17761..3b7ce43c25c 100644
--- a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
@@ -197,9 +197,12 @@ TAO_UIOP_Connection_Handler::add_transport_to_cache (void)
// Construct a property object
TAO_Base_Transport_Property prop (&endpoint);
+ TAO_Transport_Cache_Manager &cache =
+ this->orb_core ()->lane_resources ().transport_cache ();
+
// Add the handler to Cache
- return this->orb_core ()->lane_resources ().transport_cache ().cache_transport (&prop,
- this->transport ());
+ return cache.cache_idle_transport (&prop,
+ this->transport ());
}
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)