diff options
Diffstat (limited to 'TAO/tao/Invocation_Adapter.cpp')
| -rw-r--r-- | TAO/tao/Invocation_Adapter.cpp | 81 |
1 files changed, 25 insertions, 56 deletions
diff --git a/TAO/tao/Invocation_Adapter.cpp b/TAO/tao/Invocation_Adapter.cpp index 6a226f7d062..5cd48381edb 100644 --- a/TAO/tao/Invocation_Adapter.cpp +++ b/TAO/tao/Invocation_Adapter.cpp @@ -35,12 +35,10 @@ namespace TAO void Invocation_Adapter::invoke (TAO::Exception_Data *ex_data, - unsigned long ex_count - ) + unsigned long ex_count) { // Should stub object be refcounted here? - TAO_Stub *stub = - this->get_stub (); + TAO_Stub *stub = this->get_stub (); TAO_Operation_Details op_details (this->operation_, this->op_len_, @@ -50,15 +48,12 @@ namespace TAO ex_count, this->is_dii_request_); - this->invoke_i (stub, - op_details - ); + this->invoke_i (stub, op_details); } void Invocation_Adapter::invoke_i (TAO_Stub *stub, - TAO_Operation_Details &details - ) + TAO_Operation_Details &details) { // The invocation has got to be within the context of the // corresponding ORB's configuration. Otherwise things like @@ -87,8 +82,7 @@ namespace TAO if (cpb_ != 0 || effective_target->_servant () != 0) { strat = - TAO_ORB_Core::collocation_strategy (effective_target.in () - ); + TAO_ORB_Core::collocation_strategy (effective_target.in ()); } if (strat == TAO_CS_REMOTE_STRATEGY || @@ -99,23 +93,20 @@ namespace TAO this->invoke_remote_i (stub, details, effective_target, - max_wait_time - ); + max_wait_time); } else { if (strat == TAO_CS_THRU_POA_STRATEGY) { - (void) this->set_response_flags (stub, - details); + (void) this->set_response_flags (stub, details); } status = this->invoke_collocated_i (stub, details, effective_target, - strat - ); + strat); } if (status == TAO_INVOKE_RESTART) @@ -166,8 +157,7 @@ namespace TAO Invocation_Adapter::invoke_collocated_i (TAO_Stub *stub, TAO_Operation_Details &details, CORBA::Object_var &effective_target, - Collocation_Strategy strat - ) + Collocation_Strategy strat) { // To make a collocated call we must have a collocated proxy broker, the // invoke_i() will make sure that we only come here when we have one @@ -184,10 +174,7 @@ namespace TAO details, this->type_ == TAO_TWOWAY_INVOCATION); - status = - coll_inv.invoke (this->cpb_, - strat - ); + status = coll_inv.invoke (this->cpb_, strat); if (status == TAO_INVOKE_RESTART && coll_inv.is_forwarded ()) @@ -204,8 +191,7 @@ namespace TAO (void) this->object_forwarded (effective_target, stub, - is_permanent_forward - ); + is_permanent_forward); } return status; @@ -251,13 +237,10 @@ namespace TAO Invocation_Adapter::invoke_remote_i (TAO_Stub *stub, TAO_Operation_Details &details, CORBA::Object_var &effective_target, - ACE_Time_Value *&max_wait_time - ) + ACE_Time_Value *&max_wait_time) { ACE_Time_Value tmp_wait_time; - bool is_timeout = - this->get_timeout (stub, - tmp_wait_time); + bool const is_timeout = this->get_timeout (stub, tmp_wait_time); if (is_timeout) max_wait_time = &tmp_wait_time; @@ -278,8 +261,7 @@ namespace TAO stub, block_connect); - resolver.resolve (max_wait_time - ); + resolver.resolve (max_wait_time); if (TAO_debug_level) { @@ -298,16 +280,14 @@ namespace TAO return this->invoke_oneway (details, effective_target, resolver, - max_wait_time - ); + max_wait_time); } else if (this->type_ == TAO_TWOWAY_INVOCATION) { return this->invoke_twoway (details, effective_target, resolver, - max_wait_time - ); + max_wait_time); } return TAO_INVOKE_FAILURE; @@ -317,8 +297,7 @@ namespace TAO Invocation_Adapter::invoke_twoway (TAO_Operation_Details &details, CORBA::Object_var &effective_target, Profile_Transport_Resolver &r, - ACE_Time_Value *&max_wait_time - ) + ACE_Time_Value *&max_wait_time) { // Simple sanity check if (this->mode_ != TAO_SYNCHRONOUS_INVOCATION || @@ -332,13 +311,10 @@ namespace TAO TAO_INVOKE_FAILURE); } - TAO::Synch_Twoway_Invocation synch (this->target_, - r, - details); + TAO::Synch_Twoway_Invocation synch (this->target_, r, details); Invocation_Status const status = - synch.remote_twoway (max_wait_time - ); + synch.remote_twoway (max_wait_time); if (status == TAO_INVOKE_RESTART && synch.is_forwarded ()) @@ -355,8 +331,7 @@ namespace TAO this->object_forwarded (effective_target, r.stub (), - is_permanent_forward - ); + is_permanent_forward); } return status; @@ -366,16 +341,12 @@ namespace TAO Invocation_Adapter::invoke_oneway (TAO_Operation_Details &details, CORBA::Object_var &effective_target, Profile_Transport_Resolver &r, - ACE_Time_Value *&max_wait_time - ) + ACE_Time_Value *&max_wait_time) { - TAO::Synch_Oneway_Invocation synch (this->target_, - r, - details); + TAO::Synch_Oneway_Invocation synch (this->target_, r, details); Invocation_Status const s = - synch.remote_oneway (max_wait_time - ); + synch.remote_oneway (max_wait_time); if (s == TAO_INVOKE_RESTART && synch.is_forwarded ()) @@ -391,8 +362,7 @@ namespace TAO #endif this->object_forwarded (effective_target, r.stub (), - is_permanent_forward - ); + is_permanent_forward); } return s; @@ -401,8 +371,7 @@ namespace TAO void Invocation_Adapter::object_forwarded (CORBA::Object_var &effective_target, TAO_Stub *stub, - CORBA::Boolean permanent_forward - ) + CORBA::Boolean permanent_forward) { // The object pointer has to be changed to a TAO_Stub pointer // in order to obtain the profiles. |