summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorirfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-09-13 23:14:56 +0000
committerirfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-09-13 23:14:56 +0000
commita779cc038627135c82aa8386868847e2cfa3eb9f (patch)
tree79a4935f0edd7fb0c667d54bb7d4033f84439f00
parent3ce0ccc16e2dd244fd5ce99da097ccb86b70982c (diff)
downloadATCD-a779cc038627135c82aa8386868847e2cfa3eb9f.tar.gz
Minor fixes.CVS: ----------------------------------------------------------------------
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp8
3 files changed, 8 insertions, 8 deletions
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
index d758befbb98..561b5be1682 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
@@ -282,8 +282,8 @@ TAO_SSLIOP_Connection_Handler::add_transport_to_cache (void)
TAO_Base_Transport_Property prop (&endpoint);
// Add the handler to Cache
- return this->orb_core ().lane_resources ().transport_cache ().cache_transport (&prop,
- this->transport ());
+ return this->orb_core ()->lane_resources ().transport_cache ().cache_transport (&prop,
+ this->transport ());
}
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
index 7e5fe9eafad..5458b50cc7d 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
@@ -400,7 +400,7 @@ TAO_SSLIOP_Connector::ssliop_connect (TAO_SSLIOP_Endpoint *ssl_endpoint,
TAO_Transport *base_transport = 0;
// Check the Cache first for connections
- if (this->orb_core ().lane_resources ().transport_cache ().find_transport (
+ if (this->orb_core ()->lane_resources ().transport_cache ().find_transport (
desc,
base_transport) == 0)
{
@@ -418,7 +418,7 @@ TAO_SSLIOP_Connector::ssliop_connect (TAO_SSLIOP_Endpoint *ssl_endpoint,
ACE_TEXT ("making a new connection \n")));
// Purge connections (if necessary)
- this->orb_core ()->lane_resource ().transport_cache ().purge ();
+ this->orb_core ()->lane_resources ().transport_cache ().purge ();
// Setup the establishment of trust connection properties, if
// any.
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
index 239bda35e7c..6447d7e7b93 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
@@ -296,17 +296,17 @@ TAO_SSLIOP_Transport::set_bidir_context_info (TAO_Operation_Details &opdetails)
{
// Get a handle on to the acceptor registry
- TAO_Acceptor_Registry * ar =
- this->orb_core ()->acceptor_registry ();
+ TAO_Acceptor_Registry &ar =
+ this->orb_core ()->lane_resources ().acceptor_registry ();
// Get the first acceptor in the registry
- TAO_AcceptorSetIterator acceptor = ar->begin ();
+ TAO_AcceptorSetIterator acceptor = ar.begin ();
IIOP::ListenPointList listen_point_list;
for (;
- acceptor != ar->end ();
+ acceptor != ar.end ();
acceptor++)
{
// Check whether it is a IIOP acceptor