diff options
| author | morrisc <morrisc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-01-11 20:03:21 +0000 |
|---|---|---|
| committer | morrisc <morrisc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-01-11 20:03:21 +0000 |
| commit | 102d7c7aff455d456e3ebf7968f5af68d92dfb42 (patch) | |
| tree | f99f118aa5f8efd4bd23b3675b8c9d757da9b639 | |
| parent | 84eddbf1261ba0b5537c4db1233d91ba7466cc9b (diff) | |
| download | ATCD-102d7c7aff455d456e3ebf7968f5af68d92dfb42.tar.gz | |
Fix ior to strip JACORB: from server name if present.
| -rw-r--r-- | TAO/OCI_RE_ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp | 11 |
2 files changed, 16 insertions, 1 deletions
diff --git a/TAO/OCI_RE_ChangeLog b/TAO/OCI_RE_ChangeLog index f00077c56f7..cd20907a2a3 100644 --- a/TAO/OCI_RE_ChangeLog +++ b/TAO/OCI_RE_ChangeLog @@ -1,3 +1,9 @@ +Fri Jan 11 03:55:40 UTC 2013 Carey Morris <morrisc@ociweb.com> + + * orbsvcs/ImplRepo_Service/tao_imr_i.cpp + + Fix ior to strip JACORB: from server name if present. + Fri Jan 11 19:11:55 UTC 2013 Phillip LaBanca <labancap@ociweb.com> * orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp: diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp index 674a60b437a..61753e679ee 100644 --- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp @@ -817,7 +817,16 @@ TAO_IMR_Op_IOR::run (void) ACE_CString ior (imr_str.in ()); // Add the key - ior += this->server_name_; + const char jacorb[] = "JACORB:"; + const char *posjacorb = ACE_OS::strstr (server_name_.c_str (), jacorb); + if (posjacorb) + { + ior += posjacorb + sizeof(jacorb) - 1; + } + else + { + ior += this->server_name_; + } ACE_DEBUG ((LM_DEBUG, "%s\n", ior.c_str ())); |