diff options
| author | stanleyk <stanleyk@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-02-05 21:11:03 +0000 |
|---|---|---|
| committer | stanleyk <stanleyk@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-02-05 21:11:03 +0000 |
| commit | 5e030faf84086ab02059fcbcc3faed224bd57b95 (patch) | |
| tree | 3a62df45ac6ccf599fb07cf6a03d672456ce2e3d /TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp | |
| parent | 9d296f7fa51116ff7040ecb2ad18612cd94b5fd1 (diff) | |
| download | ATCD-5e030faf84086ab02059fcbcc3faed224bd57b95.tar.gz | |
Merge in OCI_Reliability_Enhancements branch.
Diffstat (limited to 'TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp')
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp index 674a60b437a..2837ef12135 100644 --- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp @@ -817,9 +817,18 @@ TAO_IMR_Op_IOR::run (void) ACE_CString ior (imr_str.in ()); // Add the key - ior += this->server_name_; + const char jacorb[] = ACE_TEXT_ALWAYS_CHAR ("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 ())); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%s\n"), ior.c_str ())); if (this->filename_.length () > 0) { @@ -828,7 +837,7 @@ TAO_IMR_Op_IOR::run (void) if (file == 0) { ACE_ERROR_RETURN ((LM_ERROR, - "Error: Unable to open %s for writing: %p\n", + ACE_TEXT ("Error: Unable to open %s for writing: %p\n"), this->filename_.c_str ()), -1); } |