diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-12-09 14:25:37 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-12-09 14:25:37 +0000 |
| commit | 0bfe1975703c96f736d7aa777fadc8be3afa0b1f (patch) | |
| tree | a9efeea889339c3c1944a7a30a161c0162d2cd97 | |
| parent | c0e74f7125c48ca5fa11dd2fc8b81cf820a98ea6 (diff) | |
| download | ATCD-0bfe1975703c96f736d7aa777fadc8be3afa0b1f.tar.gz | |
Wed Dec 9 14:24:58 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* TAO_IDL/be/be_visitor_component/servant_svs.cpp:
Don't generate code to call get_receptacle_policy, that doesn't
do anything
| -rw-r--r-- | TAO/ChangeLog | 10 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp | 24 |
2 files changed, 8 insertions, 26 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index af214f62c62..7c508e6b7e7 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,11 +1,17 @@ +Wed Dec 9 14:24:58 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * TAO_IDL/be/be_visitor_component/servant_svs.cpp: + Don't generate code to call get_receptacle_policy, that doesn't + do anything + Wed Dec 9 12:45:58 UTC 2009 Martin Corino <mcorino@remedy.nl> * tests/OBV/Supports/Supports_Test.mpc: Removed dummy_label dependency. - + * tests/OBV/Supports/client.cpp: Fixed small coding error. - + * bin/tao_orb_tests.lst: Reenabled the OBV/Supports test again since the reason for excluding this one seems to have been invalidated (long ago?). diff --git a/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp b/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp index 0fe6f75b218..d611fc39eff 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp @@ -1331,30 +1331,6 @@ be_visitor_connect_block::visit_uses (be_uses *node) } else { - if (! is_multiple) - { - os_ << "ACE_CString receptacle_name (\"" << port_name - << "\");" << be_nl - << "receptacle_name += \'_\';" << be_nl - << "receptacle_name += " - << "this->context_->_ciao_instance_id ();" << be_nl - << "::CORBA::PolicyList_var policy_list =" << be_idt_nl - << "this->container_->get_receptacle_policy " - << "(receptacle_name.c_str ());" << be_uidt_nl << be_nl - << "if (policy_list->length () != 0)" << be_idt_nl - << "{" << be_idt_nl - << "::CORBA::Object_var over_ridden_object =" - << be_idt_nl - << "_ciao_conn->_set_policy_overrides (policy_list.in ()," - << be_nl - << " CORBA::SET_OVERRIDE);" - << be_uidt_nl - << "_ciao_conn =" << be_idt_nl - << "::" << obj_name << "::_narrow (over_ridden_object.in ());" - << be_uidt << be_uidt_nl - << "}" << be_uidt_nl << be_nl; - } - os_ << "/// " << (is_multiple ? "Multiplex" : "Simplex") << " connect." << be_nl << (is_multiple ? "return " : "") << "this->connect_" |