diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2002-10-31 21:20:51 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2002-10-31 21:20:51 +0000 |
| commit | 9cd112b83a72260017ed5527e62bc580e339f82d (patch) | |
| tree | 5ffca13d32bfe27961be8b7df487929657d861e4 /TAO/tao/IIOP_Connector.cpp | |
| parent | a7b2e21247b1e74c3b2bc1f7a36da7465db2891b (diff) | |
| download | ATCD-9cd112b83a72260017ed5527e62bc580e339f82d.tar.gz | |
ChangeLogTag:Thu Oct 31 14:48:39 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
Diffstat (limited to 'TAO/tao/IIOP_Connector.cpp')
| -rw-r--r-- | TAO/tao/IIOP_Connector.cpp | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp index fcbdfe29e52..86c529774ee 100644 --- a/TAO/tao/IIOP_Connector.cpp +++ b/TAO/tao/IIOP_Connector.cpp @@ -143,7 +143,8 @@ TAO_IIOP_Connector::set_validate_endpoint (TAO_Endpoint *endpoint) int TAO_IIOP_Connector::make_connection (TAO_GIOP_Invocation *invocation, - TAO_Transport_Descriptor_Interface *desc) + TAO_Transport_Descriptor_Interface *desc, + ACE_Time_Value *max_wait_time) { TAO_IIOP_Endpoint *iiop_endpoint = this->remote_endpoint (desc->endpoint ()); @@ -160,23 +161,6 @@ TAO_IIOP_Connector::make_connection (TAO_GIOP_Invocation *invocation, "to <%s:%d>\n", iiop_endpoint->host(), iiop_endpoint->port())); - - // Get the max_wait_time - ACE_Time_Value *max_wait_time = 0; - - ACE_Time_Value connection_timeout; - int timeout = 0; - - this->orb_core ()->connection_timeout (invocation->stub (), - timeout, - connection_timeout); - if (!timeout) - max_wait_time = - invocation->max_wait_time (); - else - max_wait_time = &connection_timeout; - - // Get the right synch options ACE_Synch_Options synch_options; @@ -369,7 +353,7 @@ TAO_IIOP_Connector::init_tcp_properties (void) tph->call_client_protocols_hook (send_buffer_size, recv_buffer_size, no_delay, - enable_network_priority, + enable_network_priority, protocol_type); if(hook_result == -1) |