diff options
Diffstat (limited to 'TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp')
| -rw-r--r-- | TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp index 5b0938be1df..9708dbdffd2 100644 --- a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp +++ b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp @@ -21,7 +21,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_Time_Value TAO_Optimized_Connection_Endpoint_Selector::timeout_; -TAO_Optimized_Connection_Endpoint_Selector::TAO_Optimized_Connection_Endpoint_Selector (const ACE_Time_Value &tv) +TAO_Optimized_Connection_Endpoint_Selector:: +TAO_Optimized_Connection_Endpoint_Selector (const ACE_Time_Value &tv) { TAO_Optimized_Connection_Endpoint_Selector::timeout_ = tv; if (TAO_debug_level) @@ -38,7 +39,8 @@ TAO_Optimized_Connection_Endpoint_Selector::TAO_Optimized_Connection_Endpoint_Se } } -TAO_Optimized_Connection_Endpoint_Selector::~TAO_Optimized_Connection_Endpoint_Selector (void) +TAO_Optimized_Connection_Endpoint_Selector:: +~TAO_Optimized_Connection_Endpoint_Selector (void) { } @@ -78,9 +80,8 @@ TAO_Optimized_Connection_Endpoint_Selector::check_profile (TAO_Profile *p, void TAO_Optimized_Connection_Endpoint_Selector::select_endpoint - ( TAO::Profile_Transport_Resolver *r, - ACE_Time_Value *max_wait_time - ACE_ENV_ARG_DECL) + (TAO::Profile_Transport_Resolver *r, + ACE_Time_Value *max_wait_time) { TAO_Stub *stub = r->stub(); TAO_Profile *p = stub->profile_in_use(); @@ -143,20 +144,14 @@ TAO_Optimized_Connection_Endpoint_Selector::select_endpoint if (r->blocked_connect () || (!r->blocked_connect () && r->profile ()->supports_non_blocking_oneways ())) { - const size_t endpoint_count = - r->profile ()->endpoint_count (); + const size_t endpoint_count = r->profile ()->endpoint_count (); - TAO_Endpoint *ep = - r->profile ()->endpoint (); + TAO_Endpoint *ep = r->profile ()->endpoint (); for (size_t i = 0; i < endpoint_count; ++i) { TAO_Base_Transport_Property desc (ep); - const bool retval = - r->try_connect (&desc, - max_wait_time - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + const bool retval = r->try_connect (&desc, max_wait_time); // Check if the connect has completed. if (retval) @@ -171,8 +166,7 @@ TAO_Optimized_Connection_Endpoint_Selector::select_endpoint // If we get here, we completely failed to find an endpoint selector // that we know how to use, so throw an exception. - ACE_THROW (CORBA::TRANSIENT (CORBA::OMGVMCID | 2, - CORBA::COMPLETED_NO)); + throw ::CORBA::TRANSIENT (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO); } TAO_END_VERSIONED_NAMESPACE_DECL |