diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2004-06-25 11:23:39 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2004-06-25 11:23:39 +0000 |
| commit | 3c146d29add4085528db259077ad9c6f0a65047d (patch) | |
| tree | 131ea01d73a3fb43fa7da5f6f34a110c0ea5624a /TAO/tao | |
| parent | 808787b7e57dedf89fe652a03e1526caf923a3af (diff) | |
| download | ATCD-3c146d29add4085528db259077ad9c6f0a65047d.tar.gz | |
ChangeLogTag:Fri Jun 25 06:12:49 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
Diffstat (limited to 'TAO/tao')
| -rw-r--r-- | TAO/tao/IIOP_Connector.cpp | 8 | ||||
| -rw-r--r-- | TAO/tao/Invocation_Adapter.cpp | 1 | ||||
| -rw-r--r-- | TAO/tao/Strategies/SCIOP_Connector.cpp | 8 | ||||
| -rw-r--r-- | TAO/tao/Strategies/UIOP_Connector.cpp | 8 |
4 files changed, 6 insertions, 19 deletions
diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp index 278adc6cf51..618ff481ad7 100644 --- a/TAO/tao/IIOP_Connector.cpp +++ b/TAO/tao/IIOP_Connector.cpp @@ -196,14 +196,10 @@ TAO_IIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *, svc_handler->get_handle ())); } - // Wait for connection completion. No need to specify timeout - // to wait() since the correct timeout was passed to the - // Connector. The Connector will close the handler in the case - // of timeouts, so the event will complete (either success or - // failure) within timeout. + // Wait for connection completion. result = this->active_connect_strategy_->wait (svc_handler, - 0); + max_wait_time); if (TAO_debug_level > 2) { diff --git a/TAO/tao/Invocation_Adapter.cpp b/TAO/tao/Invocation_Adapter.cpp index c067109c79a..db84fe44b9a 100644 --- a/TAO/tao/Invocation_Adapter.cpp +++ b/TAO/tao/Invocation_Adapter.cpp @@ -53,7 +53,6 @@ namespace TAO ACE_ENV_ARG_DECL) { // Cache the target to a local variable. - // @@ NOTE: Leak if forwarded CORBA::Object *effective_target = this->target_; CORBA::Object_var tmp_mem; diff --git a/TAO/tao/Strategies/SCIOP_Connector.cpp b/TAO/tao/Strategies/SCIOP_Connector.cpp index d572e796916..e387d532ca2 100644 --- a/TAO/tao/Strategies/SCIOP_Connector.cpp +++ b/TAO/tao/Strategies/SCIOP_Connector.cpp @@ -235,14 +235,10 @@ TAO_SCIOP_Connector::make_connection_i (TAO_Transport_Descriptor_Interface &desc "handle [%d]\n", svc_handler->get_handle ())); - // Wait for connection completion. No need to specify timeout - // to wait() since the correct timeout was passed to the - // Connector. The Connector will close the handler in the case - // of timeouts, so the event will complete (either success or - // failure) within timeout. + // Wait for connection completion. result = this->active_connect_strategy_->wait (svc_handler, - 0); + max_wait_time); if (TAO_debug_level > 2) { diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp index af9993137b7..d87dd885654 100644 --- a/TAO/tao/Strategies/UIOP_Connector.cpp +++ b/TAO/tao/Strategies/UIOP_Connector.cpp @@ -201,13 +201,9 @@ TAO_UIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *, "handle [%d]\n", svc_handler->get_handle ())); - // Wait for connection completion. No need to specify timeout - // to wait() since the correct timeout was passed to the - // Connector. The Connector will close the handler in the case - // of timeouts, so the event will complete (either success or - // failure) within timeout. result = - this->active_connect_strategy_->wait (svc_handler, 0); + this->active_connect_strategy_->wait (svc_handler, + max_wait_time); if (TAO_debug_level > 2) { |