summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs
diff options
context:
space:
mode:
authorjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-05-30 17:28:33 +0000
committerjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-05-30 17:28:33 +0000
commit70acca4d6ef1f332663a9d29a8c989bb92ebd952 (patch)
tree2d19437f2ee62c1cba7b3d05b7f863951ae329e3 /TAO/orbsvcs
parentcd19bf275714e89406bb25810e80acda046e755e (diff)
downloadATCD-70acca4d6ef1f332663a9d29a8c989bb92ebd952.tar.gz
ChangeLogTag: Mon May 30 10:23:27 2005 J.T. Conklin <jtc@acorntoolworks.com>
Diffstat (limited to 'TAO/orbsvcs')
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/Log_i.cpp17
1 files changed, 11 insertions, 6 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
index 8db0f6d32a8..21fb2d48faf 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
@@ -85,12 +85,13 @@ TAO_Log_i::get_log_qos (ACE_ENV_SINGLE_ARG_DECL)
// have submitted a defect report to the OMG for clarification.
// --jtc
- DsLogAdmin::QoSList_var ret_val;
- ACE_NEW_THROW_EX (ret_val,
+ DsLogAdmin::QoSList* ret_ptr;
+ ACE_NEW_THROW_EX (ret_ptr,
DsLogAdmin::QoSList (1),
CORBA::NO_MEMORY ());
ACE_CHECK_RETURN (0);
+ DsLogAdmin::QoSList_var ret_val = ret_ptr;
ret_val->length(1);
ret_val[0] = qostype_;
@@ -149,19 +150,23 @@ TAO_Log_i::set_log_qos (const DsLogAdmin::QoSList &qos
this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
- DsLogAdmin::QoSList_var old_qoslist;
- ACE_NEW_THROW_EX (old_qoslist,
+ DsLogAdmin::QoSList* old_qoslist_ptr;
+ ACE_NEW_THROW_EX (old_qoslist_ptr,
DsLogAdmin::QoSList (1),
CORBA::NO_MEMORY ());
ACE_CHECK;
+
+ DsLogAdmin::QoSList_var old_qoslist = old_qoslist_ptr;
old_qoslist->length(1);
old_qoslist[0] = old_qos;
- DsLogAdmin::QoSList_var new_qoslist;
- ACE_NEW_THROW_EX (new_qoslist,
+ DsLogAdmin::QoSList* new_qoslist_ptr;
+ ACE_NEW_THROW_EX (new_qoslist_ptr,
DsLogAdmin::QoSList (1),
CORBA::NO_MEMORY ());
ACE_CHECK;
+
+ DsLogAdmin::QoSList_var new_qoslist = new_qoslist_ptr;
new_qoslist->length(1);
new_qoslist[0] = qostype;