Logging changes

    * TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp:
    * TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp:
    * TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp:
    * TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp:
    * TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp:

5 files changed, 28 insertions, 12 deletions

diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp
index 1f231afecf6..456dde6b655 100644
--- a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp
@@ -230,7 +230,7 @@ AsyncAccessManager::final_state (bool active)
       if (ImR_Locator_i::debug () > 5)
         {
           ORBSVCS_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("(%P|%t) AsyncAccessManager(%@)::final_state ")
+                          ACE_TEXT ("(%P|%t) AsyncAccessManager(%@)::final_state - ")
                           ACE_TEXT ("removing this from map, server <%C> remove_on_death_rh_ <%@>\n"),
                           this, info_->ping_id (), this->remove_on_death_rh_));
         }
@@ -253,10 +253,24 @@ AsyncAccessManager::notify_waiter (ImR_ResponseHandler *rh)
     {
       if (this->info_->is_mode (ImplementationRepository::PER_CLIENT))
         {
+          if (ImR_Locator_i::debug () > 5)
+            {
+              ORBSVCS_DEBUG ((LM_DEBUG,
+                              ACE_TEXT ("(%P|%t) AsyncAccessManager(%@)::notify_waiter - ")
+                              ACE_TEXT ("For unique server <%C> reporting back IOR <%C>\n"),
+                              this, info_->ping_id (), this->partial_ior_.c_str()));
+            }
           rh->send_ior (this->partial_ior_.c_str());
         }
       else
         {
+          if (ImR_Locator_i::debug () > 5)
+            {
+              ORBSVCS_DEBUG ((LM_DEBUG,
+                              ACE_TEXT ("(%P|%t) AsyncAccessManager(%@)::notify_waiter - ")
+                              ACE_TEXT ("For server <%C> reporting back IOR <%C>\n"),
+                              this, info_->ping_id (), this->info_->partial_ior.c_str()));
+            }
           rh->send_ior (this->info_->partial_ior.c_str());
         }
     }
diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
index 3ea492fdd0c..cc88f060de7 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
@@ -199,7 +199,7 @@ ImR_DSI_ResponseHandler::send_ior (const char *pior)
         {
           ORBSVCS_ERROR ((LM_ERROR,
                       ACE_TEXT ("(%P|%t) ImR_DSI_ResponseHandler::send_ior (): Forward_to ")
-                      ACE_TEXT ("reference is nil.\n")));
+                      ACE_TEXT ("reference is nil\n")));
         }
     }
   else
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
index d190a34fcb1..43c20f68948 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
@@ -150,7 +150,7 @@ run_service_command (Activator_Options& opts)
           }
       if (ret != -1)
         {
-          ORBSVCS_DEBUG ((LM_DEBUG, "ImR Activator: Service installed.\n"));
+          ORBSVCS_DEBUG ((LM_DEBUG, "ImR Activator: Service installed\n"));
           opts.save_registry_options ();
         }
       else
@@ -163,7 +163,7 @@ run_service_command (Activator_Options& opts)
   else if (opts.service_command () == Activator_Options::SC_REMOVE)
     {
       int ret = SERVICE::instance ()->remove ();
-      ORBSVCS_DEBUG ((LM_DEBUG, "ImR Activator: Service removed.\n"));
+      ORBSVCS_DEBUG ((LM_DEBUG, "ImR Activator: Service removed\n"));
       if (ret == 0)
         return 1; // If successful, then we don't want to continue.
     }
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
index 1713b50313c..819f35b7f4f 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
@@ -107,7 +107,7 @@ ImR_Activator_i::register_with_imr (ImplementationRepository::Activator_ptr acti
             locator_->register_activator (name_.c_str (), activator);
 
           if (debug_ > 0)
-            ORBSVCS_DEBUG((LM_DEBUG, "(%P|%t) ImR Activator: Registered with ImR.\n"));
+            ORBSVCS_DEBUG((LM_DEBUG, "(%P|%t) ImR Activator: Registered with ImR\n"));
 
           return;
         }
@@ -123,7 +123,7 @@ ImR_Activator_i::register_with_imr (ImplementationRepository::Activator_ptr acti
     }
 
   if (debug_ > 0)
-    ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) ImR Activator: Not registered with ImR.\n"));
+    ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) ImR Activator: Not registered with ImR\n"));
 }
 
 int
@@ -260,13 +260,13 @@ ImR_Activator_i::fini (void)
     {
       if (debug_ > 1)
         ORBSVCS_ERROR ((LM_ERROR,
-                        ACE_TEXT ("(%P|%t) ImR Activator: COMM_FAILURE, unable to unregister from ImR.\n")));
+                        ACE_TEXT ("(%P|%t) ImR Activator: COMM_FAILURE, unable to unregister from ImR\n")));
     }
   catch (const CORBA::TRANSIENT&)
     {
       if (debug_ > 1)
         ORBSVCS_ERROR ((LM_ERROR,
-                        ACE_TEXT ("(%P|%t) ImR Activator: TRANSIENT, unable to unregister from ImR.\n")));
+                        ACE_TEXT ("(%P|%t) ImR Activator: TRANSIENT, unable to unregister from ImR\n")));
     }
   catch (const CORBA::Exception& ex)
     {
@@ -279,7 +279,7 @@ ImR_Activator_i::fini (void)
       this->orb_->destroy ();
 
       if (debug_ > 0)
-        ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) ImR Activator: Shut down successfully.\n"));
+        ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) ImR Activator: Shut down successfully\n"));
     }
   catch (const CORBA::Exception& ex)
     {
@@ -323,7 +323,9 @@ ImR_Activator_i::shutdown (bool signaled)
   if (signaled && this->in_upcall ())
     {
       if (debug_ > 0)
-        ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) ImR Activator: ignoring signal during upcall.\n"));
+      {
+        ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) ImR Activator: ignoring signal during upcall\n"));
+      }
       return;
     }
   if (! CORBA::is_nil (this->locator_.in ()) && this->registration_token_ != 0)
@@ -556,7 +558,7 @@ ImR_Activator_i::start_server(const char* name,
                 {
                   ORBSVCS_DEBUG ((LM_DEBUG,
                                   ACE_TEXT ("(%P|%t) ImR Activator: Notifying ImR that ")
-                                  ACE_TEXT ("<%C> has started with pid <%d>.\n"),
+                                  ACE_TEXT ("<%C> has started with pid <%d>\n"),
                                   name, static_cast<int> (pid)));
                 }
               try
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
index acbe55ff81a..62f816fc231 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
@@ -485,7 +485,7 @@ ImR_Locator_i::child_death_i (const char* name, int pid)
   if (debug_ > 1)
     {
       ORBSVCS_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("(%P|%t) ImR: Server <%C> has died with pid <%d>.\n"),
+                      ACE_TEXT ("(%P|%t) ImR: Server <%C> has died with pid <%d>\n"),
                       name, pid));
     }