diff options
| author | Marijke Hengstmengel <MHengstmengel@users.noreply.github.com> | 2011-11-29 14:03:57 +0000 |
|---|---|---|
| committer | Marijke Hengstmengel <MHengstmengel@users.noreply.github.com> | 2011-11-29 14:03:57 +0000 |
| commit | 6dc115b50d07fdc65ddaacfd3b7bdc84b1b23edf (patch) | |
| tree | 69fe1290899705a7c913923690ce26bdacce888f | |
| parent | 65b1b704ad96a35e399d26843d7f0acb1d0a1afa (diff) | |
| download | ATCD-6dc115b50d07fdc65ddaacfd3b7bdc84b1b23edf.tar.gz | |
Tue Nov 29 12:59:03 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl>
* TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp:
Correct check nil pointer in facet operation
| -rw-r--r-- | TAO/ChangeLog.BRANCH | 4 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp | 19 |
2 files changed, 12 insertions, 11 deletions
diff --git a/TAO/ChangeLog.BRANCH b/TAO/ChangeLog.BRANCH index 804277615d8..315a7632f34 100644 --- a/TAO/ChangeLog.BRANCH +++ b/TAO/ChangeLog.BRANCH @@ -1,3 +1,7 @@ +Tue Nov 29 12:59:03 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl> + * TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp: + Correct check nil pointer in facet operation + Mon Nov 28 15:26:03 UTC 2011 Marijke Hengstmengel <hengstmengel_m@remedy.nl> * TAO_IDL/be/be_visitor_connector/executor_ami_exh.cpp: diff --git a/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp b/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp index 93952c797a9..c02e4a22565 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp @@ -682,13 +682,11 @@ be_visitor_facet_ami_exs::gen_facet_executor_sync_op (be_operation *node) << "this->context_->get_connection_ami4ccm_port_ami4ccm_uses ();" << be_uidt_nl << be_nl; - os_ << "if (! ::CORBA::is_nil (receptacle_objref.in ()))" + os_ << "if (::CORBA::is_nil (receptacle_objref.in ()))" << be_idt_nl << "{" << be_idt_nl << "throw ::CORBA::INV_OBJREF ();" << be_uidt_nl - << "}" << be_uidt_nl - << "else" << be_idt_nl - << "{" << be_idt_nl; + << "}" << be_uidt_nl << be_nl; if (ret) { os_ << "return " ; @@ -704,19 +702,18 @@ be_visitor_facet_ami_exs::gen_facet_executor_sync_op (be_operation *node) i.next (), ++index) { AST_Decl *d = i.item (); - if (index == 0UL) + if (index == 0UL) { os_ << d->local_name (); - } - else - { + } + else + { os_ << "," << be_nl << d->local_name (); - } + } } - os_ << ");" << be_uidt << be_uidt << be_uidt_nl - << "}" << be_uidt << be_uidt << be_nl; + os_ << ");" << be_uidt << be_uidt << be_uidt_nl; os_ << "}"; return 0; |