diff options
| author | Marijke Hengstmengel <MHengstmengel@users.noreply.github.com> | 2011-12-01 13:53:47 +0000 |
|---|---|---|
| committer | Marijke Hengstmengel <MHengstmengel@users.noreply.github.com> | 2011-12-01 13:53:47 +0000 |
| commit | 805b314cac2ac4371254d2a2b24427be9b916735 (patch) | |
| tree | 14be247f473d47b6a244f8aff17ef1be2f6d8f10 | |
| parent | 95407de4d6acce27bad148ac1ca18a531dff938f (diff) | |
| download | ATCD-805b314cac2ac4371254d2a2b24427be9b916735.tar.gz | |
Thu Dec 1 13:51:38 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl>
* TAO_IDL/be/be_visitor_component/servant_svh.cpp:
* TAO_IDL/be/be_visitor_component/servant_svs.cpp:
Facet on AMI connector svnt wasn't local.
| -rw-r--r-- | TAO/ChangeLog.BRANCH | 6 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp | 6 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp | 12 |
3 files changed, 24 insertions, 0 deletions
diff --git a/TAO/ChangeLog.BRANCH b/TAO/ChangeLog.BRANCH index 33e907e6631..f6d0d81416c 100644 --- a/TAO/ChangeLog.BRANCH +++ b/TAO/ChangeLog.BRANCH @@ -1,3 +1,9 @@ +Thu Dec 1 13:51:38 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl> + + * TAO_IDL/be/be_visitor_component/servant_svh.cpp: + * TAO_IDL/be/be_visitor_component/servant_svs.cpp: + Facet on AMI connector svnt wasn't local. + Wed Nov 30 16:45:10 UTC 2011 Marijke Hengstmengel <hengstmengel_m@remedy.nl> * TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp: diff --git a/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp b/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp index 0709be18cd0..ff8218f2a12 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp @@ -148,6 +148,12 @@ be_visitor_servant_svh::visit_provides (be_provides *node) return 0; } + // special case sync port AMI connector, treat as local + if (ACE_OS::strstr (node->local_name ()->get_string (), "ami4ccm_sync_provides") != 0) + { + return 0; + } + ACE_CString prefix (this->ctx_->port_prefix ()); prefix += node->local_name ()->get_string (); const char *port_name = prefix.c_str (); 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 f099df71945..feb708388d2 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp @@ -261,6 +261,13 @@ be_visitor_servant_svs::visit_provides (be_provides *node) return 0; } + // special case sync port AMI connector, treat as local + if (ACE_OS::strstr (node->local_name ()->get_string (), "ami4ccm_sync_provides") != 0) + { + return 0; + } + + ACE_CString prefix (this->ctx_->port_prefix ()); prefix += node->local_name ()->get_string (); const char *port_name = prefix.c_str (); @@ -1531,6 +1538,11 @@ be_visitor_populate_port_tables::visit_provides ( { return 0; } + // special case sync port AMI connector, treat as local + if (ACE_OS::strstr (node->local_name ()->get_string (), "ami4ccm_sync_provides") != 0) + { + return 0; + } ACE_CString prefix (this->ctx_->port_prefix ()); prefix += node->local_name ()->get_string (); |