summaryrefslogtreecommitdiff
path: root/TAO/tao/Remote_Invocation.cpp
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>2004-04-13 07:02:28 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>2004-04-13 07:02:28 +0000
commit47b3af1237bb202095f2f30d9b4347eaea3784a0 (patch)
tree1c6c3103a92e233ee1683bd5c5ea2de89cb744bf /TAO/tao/Remote_Invocation.cpp
parent066049457b23142d25d8ae3614b48df26c1a4b70 (diff)
downloadATCD-47b3af1237bb202095f2f30d9b4347eaea3784a0.tar.gz
Mon Apr 12 23:57:24 2004 Ossama Othman <ossama@dre.vanderbilt.edu>
Diffstat (limited to 'TAO/tao/Remote_Invocation.cpp')
-rw-r--r--TAO/tao/Remote_Invocation.cpp20
1 files changed, 9 insertions, 11 deletions
diff --git a/TAO/tao/Remote_Invocation.cpp b/TAO/tao/Remote_Invocation.cpp
index e2545e35a2c..70de9a184bc 100644
--- a/TAO/tao/Remote_Invocation.cpp
+++ b/TAO/tao/Remote_Invocation.cpp
@@ -15,11 +15,10 @@ ACE_RCSID (tao,
namespace TAO
{
Remote_Invocation::Remote_Invocation (
- CORBA::Object_ptr otarget,
- Profile_Transport_Resolver &resolver,
- TAO_Operation_Details &detail,
- bool response_expected)
-
+ CORBA::Object_ptr otarget,
+ Profile_Transport_Resolver &resolver,
+ TAO_Operation_Details &detail,
+ bool response_expected)
: Invocation_Base (otarget,
resolver.object (),
resolver.stub (),
@@ -48,8 +47,7 @@ namespace TAO
* Mega hack for RTCORBA END
*/
- TAO_Profile *pfile =
- this->resolver_.profile ();
+ TAO_Profile *pfile = this->resolver_.profile ();
// Set the target specification mode
switch (pfile->addressing_mode ())
@@ -75,7 +73,7 @@ namespace TAO
// index that we need.
CORBA::ULong index = 0;
IOP::IOR *ior_info = 0;
- int retval =
+ const int retval =
this->resolver_.stub ()->create_ior_info (ior_info,
index
ACE_ENV_ARG_PARAMETER);
@@ -137,7 +135,7 @@ namespace TAO
ACE_Time_Value *max_wait_time
ACE_ENV_ARG_DECL)
{
- int retval =
+ const int retval =
this->resolver_.transport ()->send_request (
this->resolver_.stub (),
this->resolver_.stub ()->orb_core (),
@@ -150,13 +148,13 @@ namespace TAO
if (errno == ETIME)
{
// We sent a message already and we haven't gotten a
- // reply. Just throw YIMMEOUT with *COMPLETED_MAYBE*.
+ // reply. Just throw TIMEOUT with *COMPLETED_MAYBE*.
ACE_THROW_RETURN (
CORBA::TIMEOUT (
CORBA::SystemException::_tao_minor_code (
TAO_TIMEOUT_SEND_MINOR_CODE,
errno
- ),
+ ),
CORBA::COMPLETED_MAYBE
),
TAO_INVOKE_FAILURE