summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>2005-03-04 17:44:53 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>2005-03-04 17:44:53 +0000
commit79397bcf4ede9f306d672570e0c905459cbd2668 (patch)
tree6ddfe5732f0f39eeb0e132c2072aa07c96e5247b
parent49aa2cd64ae82c7d36c30ff2f77ed76810025b1b (diff)
downloadATCD-79397bcf4ede9f306d672570e0c905459cbd2668.tar.gz
ChangeLogTag:Fri Mar 04 09:26:46 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
-rw-r--r--TAO/tao/Collocated_Invocation.cpp16
-rw-r--r--TAO/tao/PortableServer/Object_Adapter.cpp2
2 files changed, 9 insertions, 9 deletions
diff --git a/TAO/tao/Collocated_Invocation.cpp b/TAO/tao/Collocated_Invocation.cpp
index 52ef23d2b0b..a899b5d0280 100644
--- a/TAO/tao/Collocated_Invocation.cpp
+++ b/TAO/tao/Collocated_Invocation.cpp
@@ -49,8 +49,8 @@ namespace TAO
{
if (strat == TAO_CS_THRU_POA_STRATEGY)
{
- // Perform invocations on the servant through the servant's ORB.
- CORBA::ORB_var servant_orb = this->stub ()->servant_orb_ptr ();
+ // Perform invocations on the servant through the servant's ORB.
+ CORBA::ORB_var servant_orb = this->stub ()->servant_orb_ptr ();
TAO_ORB_Core * const orb_core = servant_orb->orb_core ();
TAO_ServerRequest request (orb_core,
@@ -60,12 +60,12 @@ namespace TAO
TAO_Request_Dispatcher * const dispatcher =
orb_core->request_dispatcher ();
- // Retain ownership of the servant's ORB_Core in case
- // another thread attempts to destroy it (e.g. via
- // CORBA::ORB::destroy()) before this thread complete the
- // invocation.
- orb_core->_incr_refcnt ();
- TAO_ORB_Core_Auto_Ptr my_orb_core (orb_core);
+ // Retain ownership of the servant's ORB_Core in case
+ // another thread attempts to destroy it (e.g. via
+ // CORBA::ORB::destroy()) before this thread complete the
+ // invocation.
+ orb_core->_incr_refcnt ();
+ TAO_ORB_Core_Auto_Ptr my_orb_core (orb_core);
dispatcher->dispatch (orb_core,
request,
diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp
index 91b56afd6fd..cfdd59550d0 100644
--- a/TAO/tao/PortableServer/Object_Adapter.cpp
+++ b/TAO/tao/PortableServer/Object_Adapter.cpp
@@ -349,7 +349,7 @@ TAO_Object_Adapter::dispatch_servant (const TAO::ObjectKey &key,
else
{
servant_upcall.pre_invoke_remote_request (req
- ACE_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (result);
}