tao_imr enhancements for JacORB

2 files changed, 9 insertions, 3 deletions

diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
index c456bb64634..6fa857bfdd8 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
@@ -863,7 +863,7 @@ ImR_Locator_i::parse_id(const char* id, ACE_CString& server_id, ACE_CString& nam
       server_id = idstr.substr (0, pos - id);
       name = idstr.substr (pos - id + 1);
       if (server_id == "JACORB")
-	    {
+        {
           jacorb_server = true;
           ssize_t idx = name.find("/");
           server_id = name.substr(0, idx);
diff --git a/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp b/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp
index bc5a9a53d67..5a70ab4f818 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp
@@ -39,8 +39,14 @@ Server_Info::createImRServerInfo (void) const
   ImplementationRepository::ServerInformation* info;
   ACE_NEW_THROW_EX (info, ImplementationRepository::ServerInformation, CORBA::NO_MEMORY ());
 
-  ACE_CString jacorb_name ("JACORB:" + name);
-  info->server = jacorb_server ? jacorb_name.c_str () : name.c_str ();  info->startup.command_line = cmdline.c_str ();
+  info->startup.command_line = cmdline.c_str ();
+  if (jacorb_server)
+    {
+      ACE_CString jacorb_name ("JACORB:" + name);
+      info->server = jacorb_name.c_str();
+    }
+  else
+    info->server = name.c_str();
   info->startup.command_line = cmdline.c_str ();
   info->startup.environment = env_vars;
   info->startup.working_directory = dir.c_str ();