summaryrefslogtreecommitdiff
path: root/TAO/tao/ClientRequestInfo_i.cpp
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>2002-02-03 05:35:38 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>2002-02-03 05:35:38 +0000
commit9697de305f9eadbbb9f014cd138d39a1d34ab10b (patch)
tree7f6a1056d7ed9283c9ad58446d987f28dd781727 /TAO/tao/ClientRequestInfo_i.cpp
parentf451d3fba6fc55b2f5d7eb1073dacbb83bbfa793 (diff)
downloadATCD-9697de305f9eadbbb9f014cd138d39a1d34ab10b.tar.gz
ChangeLogTag:Sat Feb 2 21:33:43 2002 Ossama Othman <ossama@uci.edu>
Diffstat (limited to 'TAO/tao/ClientRequestInfo_i.cpp')
-rw-r--r--TAO/tao/ClientRequestInfo_i.cpp19
1 files changed, 3 insertions, 16 deletions
diff --git a/TAO/tao/ClientRequestInfo_i.cpp b/TAO/tao/ClientRequestInfo_i.cpp
index 1786f73a2cf..869e80f3e09 100644
--- a/TAO/tao/ClientRequestInfo_i.cpp
+++ b/TAO/tao/ClientRequestInfo_i.cpp
@@ -527,25 +527,12 @@ TAO_ClientRequestInfo_i::get_service_context_i (
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- // Create a new service context to be returned. Assume
- // success.
- IOP::ServiceContext *service_context = 0;
- ACE_NEW_THROW_EX (service_context,
- IOP::ServiceContext,
- CORBA::NO_MEMORY (
- CORBA::SystemException::_tao_minor_code (
- TAO_DEFAULT_MINOR_CODE,
- ENOMEM),
- CORBA::COMPLETED_NO));
- ACE_CHECK_RETURN (0);
-
- IOP::ServiceContext_var safe_service_context = service_context;
+ IOP::ServiceContext_var service_context;
- service_context->context_id = id;
- if (service_context_list.get_context (*service_context) != 0)
+ if (service_context_list.get_context (id, service_context.out ()) != 0)
{
// Found.
- return safe_service_context._retn ();
+ return service_context._retn ();
}
else
{