From d715f65ef80a6c7d7be8ac5da315750efacbee26 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Thu, 6 Dec 2018 11:35:14 +0100
Subject: In notify_child_death check for a valid pid, not zero

    * TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp:
    * TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp:
---
 TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp |  8 ++++----
 TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp      | 15 +++++++++------
 2 files changed, 13 insertions(+), 10 deletions(-)

(limited to 'TAO/orbsvcs/ImplRepo_Service')

diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp
index 03c0ac49488..b680f09177d 100644
--- a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp
@@ -315,9 +315,9 @@ AsyncAccessManager::notify_waiters (void)
       catch (const CORBA::Exception& ex)
       {
         if (ImR_Locator_i::debug () > 1)
-        {
-          ex._tao_print_exception ("AsyncAccessManager::notify_waiters");
-        }
+          {
+            ex._tao_print_exception ("AsyncAccessManager::notify_waiters");
+          }
       }
     }
   this->rh_list_.clear ();
@@ -521,7 +521,7 @@ AsyncAccessManager::notify_child_death (int pid)
                       this, info_->ping_id (), pid, status_name (status_),
                       this->info_->pid, this->prev_pid_, this->rh_list_.size() ));
     }
-  if (this->info_->pid == 0 || this->info_->pid == pid || this->prev_pid_ == pid)
+  if (this->info_->pid == pid || this->prev_pid_ == pid)
     {
       if (this->status_ == ImplementationRepository::AAM_WAIT_FOR_DEATH &&
           this->rh_list_.size() > 0)
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
index 2591c93ed92..c05a6d65531 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
@@ -482,9 +482,11 @@ void
 ImR_Locator_i::child_death_i (const char* name, int pid)
 {
   if (debug_ > 1)
-    ORBSVCS_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("(%P|%t) ImR: Server[%d] has died <%C>.\n"),
-                    pid, name));
+    {
+      ORBSVCS_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("(%P|%t) ImR: Server<%d> has died <%C>.\n"),
+                      pid, name));
+    }
 
   this->pinger_.remove_server (name, pid);
   AsyncAccessManager_ptr aam (this->find_aam (name, false));
@@ -502,10 +504,11 @@ ImR_Locator_i::child_death_i (const char* name, int pid)
   else
     {
       if (debug_ > 1)
-        ORBSVCS_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("(%P|%t) ImR: Failed to find server/pid in repository.\n")));
+        {
+          ORBSVCS_DEBUG ((LM_DEBUG,
+                          ACE_TEXT ("(%P|%t) ImR: Failed to find server/pid in repository.\n")));
+        }
     }
-
 }
 
 void
-- 
cgit v1.2.1