From b7b224bc487db43c7213e3a1ea00b310b0a85890 Mon Sep 17 00:00:00 2001 From: Ossama Othman Date: Wed, 20 Nov 2002 23:26:51 +0000 Subject: ChangeLogTag:Wed Nov 20 15:23:40 2002 Ossama Othman --- TAO/ChangeLog | 10 ++++++++++ TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'TAO') diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 46d0240571c..20249f53b4a 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,13 @@ +Wed Nov 20 15:23:40 2002 Ossama Othman + + * TAO_IDL/be/be_visitor_operation/ami_cs.cpp + (gen_marshal_and_invoke): + + Initialize the invocation status variable in the generated stub + code. Previously, that variable was uninitialized, which caused + some invalid code execution paths to occur. Fixes some problems + exhibited by TAO's basic AMI regression test. + Wed Nov 20 15:15:02 2002 Ossama Othman * tao/ClientRequestInfo_i.h (setup_picurrent): diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp index 3520c7418cc..2da80088d2c 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp @@ -364,7 +364,8 @@ be_visitor_operation_ami_cs::gen_marshal_and_invoke (be_operation *node, << "\n#endif /* TAO_HAS_INTERCEPTORS */\n" << be_nl; *os << "for (;;)" << be_nl - << "{" << be_idt_nl; + << "{" << be_idt_nl + << "_invoke_status = TAO_INVOKE_EXCEPTION;" << be_nl; *os << "\n#if TAO_HAS_INTERCEPTORS == 1" << be_nl << "TAO_AMI_ClientRequestInfo_i _tao_ri (" << be_idt << be_idt_nl -- cgit v1.2.1