Adorn with temp debugging

5 files changed, 33 insertions, 14 deletions

diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp
index 6f74aec24c5..c3ffa4b04ce 100644
--- a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp
@@ -537,6 +537,7 @@ AsyncAccessManager::ping_replied (LiveStatus server)
       {
         if (this->status_ == ImplementationRepository::AAM_WAIT_FOR_PING)
           {
+          ACE_DEBUG((LM_DEBUG, "death notify is %d\n", this->info_->death_notify));
             if (this->info_->death_notify && this->info_->pid != 0)
               {
                 if (ImR_Locator_i::debug () > 4)
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
index 4c440a0ffcf..ec92824fa63 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
@@ -572,8 +572,7 @@ ImR_Locator_i::spawn_pid
                           info.edit ()->active_info ()->pid, pid));
         }
 
-      //info.edit ()->active_info ()->pid = pid;
-     AsyncAccessManager_ptr aam (this->find_aam (name, true));
+      AsyncAccessManager_ptr aam (this->find_aam (name, true));
       if (aam.is_nil ())
         {
           aam = this->find_aam (name, false);
@@ -583,6 +582,7 @@ ImR_Locator_i::spawn_pid
           aam->update_prev_pid ();
         }
       info.edit ()->active_info ()->pid = pid;
+      ACE_DEBUG((LM_DEBUG, "spawn_pid setting death_notify true\n"));
       info.edit ()->active_info ()->death_notify = true;
     }
   else
@@ -1163,7 +1163,8 @@ ImR_Locator_i::shutdown_server_i (const Server_Info_Ptr &si,
     }
   catch (const CORBA::TIMEOUT &ex)
     {
-      info.edit ()->reset_runtime ();
+    ACE_DEBUG((LM_DEBUG, "shutdown server caught timeout, calling reset_runtime\n"));
+    info.edit ()->reset_runtime ();
       // Note : This is a good thing. It means we didn't waste our time waiting for
       // the server to finish shutting down.
       if (debug_ > 1)
@@ -1179,7 +1180,8 @@ ImR_Locator_i::shutdown_server_i (const Server_Info_Ptr &si,
     }
   catch (const CORBA::COMM_FAILURE& ex)
     {
-      info.edit ()->reset_runtime ();
+    ACE_DEBUG((LM_DEBUG, "shutdown_server caught comm fail, calling reset_runtime\n"));
+    info.edit ()->reset_runtime ();
       if (debug_ > 1)
         {
           ORBSVCS_DEBUG ((LM_DEBUG,
@@ -1196,7 +1198,8 @@ ImR_Locator_i::shutdown_server_i (const Server_Info_Ptr &si,
       CORBA::ULong minor = ex.minor () & TAO_MINOR_MASK;
       if (minor != TAO_POA_DISCARDING && minor != TAO_POA_HOLDING)
         {
-          info.edit ()->reset_runtime ();
+        ACE_DEBUG((LM_DEBUG, "shutdown server caught transient calling reset_runtime\n"));
+        info.edit ()->reset_runtime ();
         }
       if (debug_ > 1)
         {
@@ -1400,6 +1403,7 @@ ImR_Locator_i::server_is_shutting_down
           }
       }
     }
+  ACE_DEBUG((LM_DEBUG, "server_is_shutting_down calling reset_runtime\n"));
   info.edit ()->reset_runtime ();
   _tao_rh->server_is_shutting_down ();
 }
@@ -1491,7 +1495,8 @@ ImR_Locator_i::connect_activator (Activator_Info& info)
 
       if (CORBA::is_nil (obj.in ()))
         {
-          info.reset_runtime ();
+        ACE_DEBUG((LM_DEBUG, "connect_activator(ior is nil) calling reset_runtime\n"));
+        info.reset_runtime ();
           return;
         }
 
@@ -1505,7 +1510,8 @@ ImR_Locator_i::connect_activator (Activator_Info& info)
 
       if (CORBA::is_nil (info.activator.in ()))
         {
-          info.reset_runtime ();
+        ACE_DEBUG((LM_DEBUG, "connect_acceptor(narrow failed) calling reset_runtime\n"));
+        info.reset_runtime ();
           return;
         }
 
@@ -1514,9 +1520,10 @@ ImR_Locator_i::connect_activator (Activator_Info& info)
                         ACE_TEXT ("(%P|%t) ImR: Connected to activator <%C>\n"),
                         info.name.c_str ()));
     }
-  catch (const CORBA::Exception&)
+  catch (const CORBA::Exception& ex)
     {
-      info.reset_runtime ();
+    ACE_DEBUG((LM_DEBUG, "connect_server(caught %s) calling reset_runtime\n", ex._name()));
+    info.reset_runtime ();
     }
 }
 
@@ -1577,7 +1584,8 @@ ImR_Locator_i::connect_server (UpdateableServerInfo& info)
 
   if (sip->ior.length () == 0)
     {
-      sip->reset_runtime ();
+    ACE_DEBUG((LM_DEBUG, "connect_server(no ior) calling reset_runtime\n"));
+    sip->reset_runtime ();
       return; // can't connect
     }
 
@@ -1587,7 +1595,8 @@ ImR_Locator_i::connect_server (UpdateableServerInfo& info)
 
       if (CORBA::is_nil (obj.in ()))
         {
-          sip->reset_runtime ();
+        ACE_DEBUG((LM_DEBUG, "connect_server(string to object failed) calling reset_runtime\n"));
+        sip->reset_runtime ();
           return;
         }
 
@@ -1598,7 +1607,8 @@ ImR_Locator_i::connect_server (UpdateableServerInfo& info)
 
       if (CORBA::is_nil (sip->server.in ()))
         {
-          sip->reset_runtime ();
+        ACE_DEBUG((LM_DEBUG, "connect_server(narrow failed) calling reset_runtime\n"));
+        sip->reset_runtime ();
           return;
         }
 
@@ -1612,9 +1622,10 @@ ImR_Locator_i::connect_server (UpdateableServerInfo& info)
 
 
     }
-  catch (const CORBA::Exception&)
+  catch (const CORBA::Exception& ex)
     {
-      sip->reset_runtime ();
+    ACE_DEBUG((LM_DEBUG, "connect_server(caught %s) calling reset_runtime\n", ex._name()));
+    sip->reset_runtime ();
     }
 }
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
index ff32bcf6faa..859e7522fa4 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
@@ -337,6 +337,7 @@ Locator_Repository::unregister_if_address_reused (const ACE_CString& fqname,
           {
             aam->server_is_shutting_down ();
           }
+        ACE_DEBUG((LM_DEBUG, "address reuse calling reset_runtime\n"));
         info->reset_runtime ();
       }
   }
diff --git a/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp b/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp
index 6a63926e0e1..07cd8ec12e7 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp
@@ -29,6 +29,7 @@ Server_Info::operator= (const Server_Info &other)
   server = other.server;
   alt_info_ = other.alt_info_;
   pid = other.pid;
+  ACE_DEBUG((LM_DEBUG, "server_info.assignment setting death_notify %d\n", other.death_notify));
   death_notify = other.death_notify;
   peers = other.peers;
   env_vars = other.env_vars;
@@ -288,6 +289,7 @@ Server_Info::clear (void)
   peers.length (0);
   alt_info_.reset ();
   pid = 0;
+  ACE_DEBUG((LM_DEBUG, "server_info.clear setting death_notify false\n"));
   death_notify = false;
 }
 
@@ -297,6 +299,7 @@ Server_Info::reset_runtime (void)
   this->partial_ior = "";
   Server_Info *startup = this->active_info ();
   startup->ior = "";
+  ACE_DEBUG((LM_DEBUG, "server_info.reset_runtime setting death_notify false\n"));
   startup->death_notify = false;
   startup->last_ping = ACE_Time_Value::zero;
   startup->server = ImplementationRepository::ServerObject::_nil ();
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/TestObject.status b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/TestObject.status
new file mode 100644
index 00000000000..c6654c88d08
--- /dev/null
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/TestObject.status
@@ -0,0 +1,3 @@
+4576
+5184
+2024