Mon Apr 8 19:02:29 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com>

4 files changed, 22 insertions, 22 deletions

diff --git a/TAO/ChangeLog_Asynch_ImR b/TAO/ChangeLog_Asynch_ImR
index 242927a0a57..2e08c71138a 100644
--- a/TAO/ChangeLog_Asynch_ImR
+++ b/TAO/ChangeLog_Asynch_ImR
@@ -1,3 +1,11 @@
+Mon Apr  8 19:02:29 UTC 2013  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp:
+        * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp:
+        * orbsvcs/ImplRepo_Service/LiveCheck.cpp:
+
+          Clean up earlier debug messages, fix the list operation.
+
 Mon Apr  8 17:13:01 UTC 2013  Phil Mesnier  <mesnier_p@ociweb.com>
 
         * orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp:
diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp
index 8df64afd7a1..d22a3c10ed2 100644
--- a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp
@@ -51,8 +51,6 @@ AsyncAccessManager::add_interest (ImR_ResponseHandler *rh)
 
   if (this->info_->activation_mode == ImplementationRepository::PER_CLIENT)
     {
-      ACE_DEBUG ((LM_DEBUG, "AAM adding PerClient interest, this=%x\n", this));
-
       if (!this->send_start_request())
         {
           this->final_state();
@@ -166,8 +164,6 @@ AsyncAccessManager::status (AAM_Status s)
 void
 AsyncAccessManager::activator_replied (bool success)
 {
-  ACE_DEBUG ((LM_DEBUG, "AAM activator_replied PerClient, this=%x, success = %d\n", this, success));
-
   if (success)
     {
       this->status (AAM_WAIT_FOR_RUNNING);
@@ -194,14 +190,11 @@ AsyncAccessManager::server_is_running (const char *partial_ior,
   this->info_->partial_ior = partial_ior;
   this->info_->server = ImplementationRepository::ServerObject::_duplicate (ref);
 
-  ACE_DEBUG ((LM_DEBUG, "AAM server_is_running PerClient, this=%x, calling is_alive\n", this));
-
   if (this->locator_.pinger().is_alive (this->info_->name.c_str()))
     {
       this->status (AAM_SERVER_READY);
       this->final_state ();
     }
-  ACE_DEBUG ((LM_DEBUG, "AAM server_is_running PerClient, this=%x, prepaing for ping\n", this));
 
   // This is not a leak. The listener registers with
   // the pinger and will delete itself when done.
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
index fcfe1593773..4787d4a555f 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
@@ -1086,9 +1086,19 @@ ImR_Locator_i::list
   // Initialize the out variables, so if we return early, they will
   // not be dangling.
   server_iterator = ImplementationRepository::ServerInformationIterator::_nil ();
-  ACE_NEW_THROW_EX (server_list,
-                    ImplementationRepository::ServerInformationList (0),
-                    CORBA::NO_MEMORY ());
+
+  try
+    {
+      ACE_NEW_THROW_EX (server_list,
+                        ImplementationRepository::ServerInformationList (0),
+                        CORBA::NO_MEMORY ());
+    }
+  catch (CORBA::Exception& ex)
+    {
+      ImplementationRepository::AMH_AdministrationExceptionHolder h (ex._tao_duplicate());
+      _tao_rh->list_excep (&h);
+      return;
+    }
 
   Locator_Repository::SIMap::ENTRY* entry = 0;
   Locator_Repository::SIMap::ITERATOR it (this->repository_->servers ());
@@ -1161,8 +1171,6 @@ ImR_Locator_i::list
           CORBA::Object_var obj = this->imr_poa_->id_to_reference (id.in ());
           server_iterator = ImplementationRepository::
             ServerInformationIterator::_unchecked_narrow (obj.in ());
-
-          _tao_rh->list (server_list.in(), server_iterator.in());
         }
       catch (CORBA::Exception& ex)
         {
@@ -1170,6 +1178,7 @@ ImR_Locator_i::list
           _tao_rh->list_excep (&h);
         }
     }
+  _tao_rh->list (server_list.in(), server_iterator.in());
 }
 
 Activator_Info_Ptr
diff --git a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp
index 9edaa668ef2..63be8e1fe1c 100644
--- a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp
@@ -198,8 +198,6 @@ LiveEntry::do_ping (PortableServer::POA_ptr poa)
     this->retry_count_++;
   }
 
-  ACE_DEBUG ((LM_DEBUG, "do_ping sending request for entry = %x\n", this));
-
   PortableServer::ServantBase_var callback = new PingReceiver (this, poa);
   PortableServer::ObjectId_var oid = poa->activate_object (callback.in());
   CORBA::Object_var obj = poa->id_to_reference (oid.in());
@@ -345,13 +343,11 @@ LiveCheck::handle_timeout (const ACE_Time_Value &,
     }
 
   PerClientStack::iterator pe_end = this->per_client_.end();
-  int i = 0;
   for (PerClientStack::iterator pe = this->per_client_.begin();
        pe != pe_end;
        ++pe)
     {
       LiveEntry *entry = *pe;
-      ACE_DEBUG ((LM_DEBUG, "Checking PerClient entry[%d] %x\n",i++, entry));
       if (entry != 0)
         {
           bool result = entry->do_ping (poa_.in ());
@@ -360,8 +356,6 @@ LiveCheck::handle_timeout (const ACE_Time_Value &,
             {
               if (status != LS_DEAD)
                 {
-                  ACE_DEBUG ((LM_DEBUG, "Checking PerClient entry[%d] %x, want_reping = %d next check = %d ms\n",
-                              i++, entry, want_reping, entry->next_check().msec()));
                   if (!want_reping || entry->next_check() < next)
                     {
                       want_reping = true;
@@ -370,7 +364,6 @@ LiveCheck::handle_timeout (const ACE_Time_Value &,
                 }
               else
                 {
-                  ACE_DEBUG ((LM_DEBUG, "Removing Per Client entry %x, status = DEAD (%d)\n", entry, status));
                   this->per_client_.remove (entry);
                 }
             }
@@ -378,7 +371,6 @@ LiveCheck::handle_timeout (const ACE_Time_Value &,
             {
               if (status != LS_PING_AWAY && status != LS_TRANSIENT)
                 {
-                  ACE_DEBUG ((LM_DEBUG, "Removing Per Client entry %x, status = %d\n", entry, status));
                   this->per_client_.remove (entry);
                 }
             }
@@ -428,7 +420,6 @@ LiveCheck::remove_server (const char *server)
 void
 LiveCheck::remove_per_client_entry (LiveEntry *e)
 {
-  ACE_DEBUG ((LM_DEBUG, "Explicitly removing PerClient entry %x\n", e));
   this->per_client_.remove (e);
 }
 
@@ -441,7 +432,6 @@ LiveCheck::add_per_client_listener (LiveListener *l,
 
   LiveEntry *entry = 0;
   ACE_NEW_RETURN (entry, LiveEntry (this, 0, ref), false);
-  ACE_DEBUG ((LM_DEBUG, "Adding PerClient entry %x\n", entry));
 
   if (this->per_client_.insert_tail(entry) == 0)
     {