diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2003-09-25 16:47:42 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2003-09-25 16:47:42 +0000 |
| commit | c28f3c58ed6c8e5071b3320f8d9e7a809ea4fd77 (patch) | |
| tree | 24ead1995bcdbdd51832ec06c99fc10ddb6a4fe7 | |
| parent | bf578f3f4db392c34a85cf96e4e540eca4ab71b2 (diff) | |
| download | ATCD-c28f3c58ed6c8e5071b3320f8d9e7a809ea4fd77.tar.gz | |
ChangeLogTag:Thu Sep 25 11:46:28 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog_ref | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp | 22 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h | 6 |
3 files changed, 18 insertions, 16 deletions
diff --git a/TAO/ChangeLog_ref b/TAO/ChangeLog_ref index 60736c3cc54..d680686c6fb 100644 --- a/TAO/ChangeLog_ref +++ b/TAO/ChangeLog_ref @@ -1,3 +1,9 @@ +Thu Sep 25 11:46:28 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h: + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp: Removed + dependencies on TAO_GIOP_Invocation. + Wed Sep 24 20:02:17 2003 Jeff Parsons <j.parsons@vanderbilt.edu> * tao/PolicyC.h: diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp index 39aae932f98..8dd4bc593d5 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp @@ -11,7 +11,6 @@ #include "tao/Environment.h" #include "tao/Base_Transport_Property.h" #include "tao/Protocols_Hooks.h" -#include "tao/Invocation.h" #include "UIPMC_Profile.h" @@ -110,20 +109,17 @@ TAO_UIPMC_Connector::set_validate_endpoint (TAO_Endpoint *endpoint) return 0; } -int -TAO_UIPMC_Connector::make_connection (TAO_GIOP_Invocation *invocation, - TAO_Transport_Descriptor_Interface *desc, - ACE_Time_Value * /*max_wait_time*/) - +TAO_Transport * +TAO_UIPMC_Connector::make_connection (TAO::Profile_Transport_Resolver *, + TAO_Transport_Descriptor_Interface &desc, + ACE_Time_Value *) { - TAO_Transport *&transport = invocation->transport (); - TAO_UIPMC_Endpoint *uipmc_endpoint = ACE_dynamic_cast (TAO_UIPMC_Endpoint *, - desc->endpoint ()); + desc.endpoint ()); if (uipmc_endpoint == 0) - return -1; + return 0; const ACE_INET_Addr &remote_address = uipmc_endpoint->object_addr (); @@ -136,7 +132,7 @@ TAO_UIPMC_Connector::make_connection (TAO_GIOP_Invocation *invocation, ACE_NEW_RETURN (svc_handler_i, TAO_UIPMC_Connection_Handler (this->orb_core (), 0 /* TAO_UIPMC_Properties */), - -1); + 0); svc_handler_i->local_addr (ACE_sap_any_cast (ACE_INET_Addr &)); svc_handler_i->addr (remote_address); @@ -156,11 +152,11 @@ TAO_UIPMC_Connector::make_connection (TAO_GIOP_Invocation *invocation, // @@ Michael: We do not use traditional connection management. svc_handler->add_reference (); - transport = svc_handler->transport (); - return 0; + return svc_handler->transport (); } + TAO_Profile * TAO_UIPMC_Connector::create_profile (TAO_InputCDR& cdr) { diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h index cc17ee8cd93..410730b3fdf 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h @@ -62,9 +62,9 @@ protected: /// Transport_Connector.h int set_validate_endpoint (TAO_Endpoint *endpoint); - int make_connection (TAO_GIOP_Invocation *, - TAO_Transport_Descriptor_Interface *, - ACE_Time_Value *timeout); + TAO_Transport *make_connection (TAO::Profile_Transport_Resolver *r, + TAO_Transport_Descriptor_Interface &desc, + ACE_Time_Value *timeout = 0); virtual TAO_Profile * make_profile (ACE_ENV_SINGLE_ARG_DECL); |