diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2003-03-06 17:03:11 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2003-03-06 17:03:11 +0000 |
| commit | 219fcc41fb224832a7f0aff9344e41a10fafcb7d (patch) | |
| tree | e6bebd3cfdd2adb790a87ce915846f6d0c08faa3 | |
| parent | f9d504519374a688199f19f871a07299435a34cf (diff) | |
| download | ATCD-219fcc41fb224832a7f0aff9344e41a10fafcb7d.tar.gz | |
ChangeLog tag: Thu Mar 6 11:03:02 2003 Phil Mesnier <mesnier_p@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 20 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_operation/operation.cpp | 32 |
2 files changed, 36 insertions, 16 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 94949d29ebb..931ca58ff96 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,12 +1,20 @@ +Thu Mar 6 11:03:02 2003 Phil Mesnier <mesnier_p@ociweb.com> + + * TAO_IDL/be/be_visitor_operation/operation.cpp: + + Fix the generation of environment checking code following the call + to TAO_[In|Out]putCDR::throw_stub_exception() so it doesn't break on + non-native exception builds. + Wed Mar 5 16:09:19 2003 Phil Mesnier <mesnier_p@ociweb.com> - * tao/Codeset_Manager.h: - * tao/Codeset_Translaotr_Factory.h: - * tao/Codeset_Translator_Factory_T.h: - * tests/CodeSets/simple/server.cpp: + * tao/Codeset_Manager.h: + * tao/Codeset_Translaotr_Factory.h: + * tao/Codeset_Translator_Factory_T.h: + * tests/CodeSets/simple/server.cpp: - Fix fuzz errors - + Fix fuzz errors + Wed Mar 5 12:53:22 2003 Phil Mesnier <mesnier_p@ociweb.com> * tao/TAO.dsp: diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp index 412415dc4d6..d7adda24a85 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp @@ -846,12 +846,17 @@ be_visitor_operation::gen_marshal_and_invoke ( << "{" << be_idt_nl; // If marshaling fails, raise exception (codesetting has various minors) - *os << be_nl << be_nl - << "TAO_InputCDR::throw_stub_exception (errno " + *os << "TAO_InputCDR::throw_stub_exception (errno " << "ACE_ENV_ARG_PARAMETER); " - << be_nl << be_nl - << "TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);" - << be_nl << be_nl; + << be_nl; + if (this->gen_check_interceptor_exception (bt) == -1) + { + ACE_ERROR_RETURN ((LM_ERROR, + "(%N:%l) be_visitor_operation_cs::" + "gen_marshal_and_invoke - " + "codegen for checking exception failed\n"), + -1); + } *os << be_uidt_nl; *os << "}" << be_uidt_nl << be_nl; @@ -1048,12 +1053,19 @@ be_visitor_operation::gen_marshal_and_invoke ( << "{" << be_idt_nl; // If marshaling fails, raise exception (codesetting has various minors) - *os << be_nl << be_nl - << "TAO_InputCDR::throw_stub_exception (errno " + *os << "TAO_InputCDR::throw_stub_exception (errno " << "ACE_ENV_ARG_PARAMETER); " - << be_nl << be_nl - << "TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);" - << be_nl << be_nl; + << be_nl; + if (this->gen_check_interceptor_exception (bt) == -1) + { + ACE_ERROR_RETURN ((LM_ERROR, + "(%N:%l) be_visitor_operation_cs::" + "gen_marshal_and_invoke - " + "codegen for checking exception failed\n"), + -1); + } + + *os << be_nl; if (status == -1) { |