diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-06-02 00:01:40 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-06-02 00:01:40 +0000 |
| commit | 681c6255fda9d0c2ec452863921dec72544772fc (patch) | |
| tree | 0a52afcbeb55bdf8ca36b02629be629d6f32552a /TAO/tao/PortableServer/Object_Adapter.cpp | |
| parent | cd23b9f55c59143dcee6b83dd139cffaebb255d0 (diff) | |
| download | ATCD-681c6255fda9d0c2ec452863921dec72544772fc.tar.gz | |
ChangeLogTag:Fri Jun 1 17:00:53 2001 Ossama Othman <ossama@uci.edu>
Diffstat (limited to 'TAO/tao/PortableServer/Object_Adapter.cpp')
| -rw-r--r-- | TAO/tao/PortableServer/Object_Adapter.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp index a99e67b17c0..c73983e4944 100644 --- a/TAO/tao/PortableServer/Object_Adapter.cpp +++ b/TAO/tao/PortableServer/Object_Adapter.cpp @@ -1079,7 +1079,8 @@ TAO_Object_Adapter::Servant_Upcall::Servant_Upcall (TAO_ORB_Core *oc) poa_ (0), servant_ (0), state_ (INITIAL_STAGE), - id_ (), + system_id_ (), + user_id_ (0), current_context_ (), #if (TAO_HAS_MINIMUM_POA == 0) cookie_ (0), @@ -1119,7 +1120,7 @@ TAO_Object_Adapter::Servant_Upcall::prepare_for_upcall (const TAO_ObjectKey &key // Locate the POA. this->object_adapter_->locate_poa (key, - this->id_, + this->system_id_, this->poa_, ACE_TRY_ENV); ACE_CHECK_RETURN (TAO_Adapter::DS_FAILED); @@ -1145,7 +1146,7 @@ TAO_Object_Adapter::Servant_Upcall::prepare_for_upcall (const TAO_ObjectKey &key // Lookup the servant. this->servant_ = this->poa_->locate_servant_i (operation, - this->id_, + this->system_id_, *this, this->current_context_, ACE_TRY_ENV); |