diff options
Diffstat (limited to 'TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp')
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp | 48 |
1 files changed, 36 insertions, 12 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp index 0ec7a3d4ddf..06ce1e02e17 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp @@ -55,26 +55,43 @@ be_visitor_union_any_op_cs::visit_union (be_union *node) *os << "void operator<<= (CORBA::Any &_tao_any, const " << node->name () << " &_tao_elem) // copying" << be_nl << "{" << be_idt_nl - << "CORBA::Environment _tao_env;" << be_nl - << "_tao_any.replace (" << node->tc_name () << ", new " - << node->name () << "(_tao_elem), 1, _tao_env);" << be_uidt_nl + << node->name () << " *_any_val;" << be_nl + << "ACE_NEW (_any_val, " << node->name () << " (_tao_elem));" << be_nl + << "TAO_TRY" << be_nl + << "{" << be_idt_nl + << "_tao_any.replace (" << node->tc_name () + << ", _any_val, 1, TAO_TRY_ENV);" << " // copy the value" << be_nl + << "TAO_CHECK_ENV;" << be_uidt_nl + << "}" << be_nl + << "TAO_CATCHANY" << be_nl + << "{" << be_idt_nl + << "delete _any_val;" << be_uidt_nl + << "}" << be_nl + << "TAO_ENDTRY;" << be_uidt_nl << "}\n" << be_nl; *os << "void operator<<= (CORBA::Any &_tao_any, " << node->name () << " *_tao_elem) // non copying" << be_nl << "{" << be_idt_nl - << "CORBA::Environment _tao_env;" << be_nl + << "TAO_TRY" << be_nl + << "{" << be_idt_nl << "_tao_any.replace (" << node->tc_name () << ", " - << "_tao_elem, 1, _tao_env); // consume it" << be_uidt_nl + << "_tao_elem, 1, TAO_TRY_ENV); // consume it" << be_nl + << "TAO_CHECK_ENV;" << be_uidt_nl + << "}" << be_nl + << "TAO_CATCHANY {}" << be_nl + << "TAO_ENDTRY;" << be_uidt_nl << "}\n" << be_nl; *os << "CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, " << node->name () << " *&_tao_elem)" << be_nl << "{" << be_idt_nl - << "CORBA::Environment _tao_env;" << be_nl + << "TAO_TRY" << be_nl + << "{" << be_idt_nl << "CORBA::TypeCode_var type = _tao_any.type ();" << be_nl << "if (!type->equal (" << node->tc_name () - << ", _tao_env)) return 0; // not equal" << be_nl + << ", TAO_TRY_ENV)) return 0; // not equal" << be_nl + << "TAO_CHECK_ENV;" << be_nl << "if (_tao_any.any_owns_data ())" << be_nl << "{" << be_idt_nl << "ACE_NEW_RETURN (_tao_elem, " << node->name () << ", 0);" @@ -82,14 +99,15 @@ be_visitor_union_any_op_cs::visit_union (be_union *node) << "TAO_InputCDR stream ((ACE_Message_Block *)_tao_any.value ());" << be_nl << "if (stream.decode (" << node->tc_name () - << ", _tao_elem, 0, _tao_env)" << be_nl + << ", _tao_elem, 0, TAO_TRY_ENV)" << be_nl << " == CORBA::TypeCode::TRAVERSE_CONTINUE)" << be_nl << "{" << be_idt_nl << "((CORBA::Any *)&_tao_any)->replace (" - << node->tc_name () << ", _tao_elem, 1, _tao_env);" << be_nl - << " return 1;" << be_uidt_nl + << node->tc_name () << ", _tao_elem, 1, TAO_TRY_ENV);" << be_nl + << "TAO_CHECK_ENV;" << be_nl + << "return 1;" << be_uidt_nl << "}" << be_nl - << "else" << be_nl // decode failed + << "else" << be_nl << "{" << be_idt_nl << "delete _tao_elem;" << be_nl << "return 0;" << be_uidt_nl @@ -100,8 +118,14 @@ be_visitor_union_any_op_cs::visit_union (be_union *node) << "_tao_elem = (" << node->name () << " *)_tao_any.value ();" << be_nl << "return 1;" << be_uidt_nl + << "}" << be_uidt_nl << "}" << be_nl - << "return 0;" << be_uidt_nl + << "TAO_CATCHANY" << be_nl + << "{" << be_idt_nl + << "delete _tao_elem;" << be_nl + << "return 0; " << be_uidt_nl + << "}" << be_nl + << "TAO_ENDTRY;" << be_uidt_nl << "}\n\n"; |