diff options
Diffstat (limited to 'TAO/tao/Invocation_Base.cpp')
| -rw-r--r-- | TAO/tao/Invocation_Base.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/TAO/tao/Invocation_Base.cpp b/TAO/tao/Invocation_Base.cpp index a5558b74465..dd2ab25d2cf 100644 --- a/TAO/tao/Invocation_Base.cpp +++ b/TAO/tao/Invocation_Base.cpp @@ -155,7 +155,7 @@ namespace TAO ACE_ENDTRY; ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); - PortableInterceptor::ReplyStatus const status = + const PortableInterceptor::ReplyStatus status = this->adapter_->reply_status (*this); if (status == PortableInterceptor::LOCATION_FORWARD || @@ -222,14 +222,8 @@ namespace TAO ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (PortableInterceptor::UNKNOWN); - if (this->forwarded_to_.in ()) - { - status = PortableInterceptor::LOCATION_FORWARD; - } - else - { - status = this->adapter_->reply_status (*this); - } + status = + this->adapter_->reply_status (*this); } return status; @@ -265,7 +259,6 @@ namespace TAO else if (CORBA::UserException::_downcast (exception) != 0) this->invoke_status_ = TAO::TAO_INVOKE_USER_EXCEPTION; - this->forwarded_to_ = CORBA::Object::_nil (); this->caught_exception_ = exception; } |