diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2002-01-19 19:01:39 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2002-01-19 19:01:39 +0000 |
| commit | 92de33bf5fc137e46903adbfa3299e2abf4482e9 (patch) | |
| tree | cd9fa58a2e2f4311ee59bc7bad0afd50dcffe2e5 /TAO/tao | |
| parent | e2d0029d936d4cc17c6634b4cdd98bc05f837faf (diff) | |
| download | ATCD-92de33bf5fc137e46903adbfa3299e2abf4482e9.tar.gz | |
ChangeLogTag:Sat Jan 19 10:58:53 2002 Ossama Othman <ossama@uci.edu>
Diffstat (limited to 'TAO/tao')
| -rw-r--r-- | TAO/tao/PortableServer/ServerRequestInfo.cpp | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/TAO/tao/PortableServer/ServerRequestInfo.cpp b/TAO/tao/PortableServer/ServerRequestInfo.cpp index 345517454f9..4dea2e6e54b 100644 --- a/TAO/tao/PortableServer/ServerRequestInfo.cpp +++ b/TAO/tao/PortableServer/ServerRequestInfo.cpp @@ -315,14 +315,9 @@ TAO_ServerRequestInfo::server_id (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->servant_upcall_ != 0) - { - // Fill in later - char *server_id = - ACE_const_cast (char *, - this->server_request_.orb_core ()->server_id ()); + return + CORBA::string_dup (this->server_request_.orb_core ()->server_id ()); - return server_id; - } ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14, CORBA::COMPLETED_NO), @@ -334,14 +329,8 @@ TAO_ServerRequestInfo::orb_id (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->servant_upcall_ != 0) - { - // Fill in later - char *orbid = - ACE_const_cast (char *, - this->server_request_.orb_core ()->orbid ()); - - return orbid; - } + return + CORBA::string_dup (this->server_request_.orb_core ()->orbid ()); ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14, CORBA::COMPLETED_NO), |