Sat Apr 6 12:36:48 UTC 2013 Phil Mesnier <mesnier_p@local>

6 files changed, 21 insertions, 58 deletions

diff --git a/TAO/ChangeLog_Asynch_ImR b/TAO/ChangeLog_Asynch_ImR
index 39ca187cea7..9eab9a73eb2 100644
--- a/TAO/ChangeLog_Asynch_ImR
+++ b/TAO/ChangeLog_Asynch_ImR
@@ -1,3 +1,16 @@
+Sat Apr  6 12:36:48 UTC 2013  Phil Mesnier  <mesnier_p@local>
+
+        * orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp:
+        * orbsvcs/ImplRepo_Service/INS_Locator.cpp:
+        * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp:
+        * orbsvcs/ImplRepo_Service/LiveCheck.cpp:
+
+          More cleanup of development-level debug messages.
+
+        * tao/IORTable/Locate_ResponseHandler.cpp:
+
+          Fix for improper memory management.
+
 Fri Apr  5 21:21:15 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 d596a02fc5d..b9aeab24f1e 100644
--- a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp
@@ -48,13 +48,6 @@ AsyncAccessManager::add_interest (ImR_ResponseHandler *rh)
     ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_);
     this->rh_list_.push_back (rh);
   }
-  if (this->locator_.debug() > 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("(%P|%t) AsyncAccessManager::add_interest: ")
-                  ACE_TEXT ("server = <%C>, status = %d count = %d\n"),
-                  this->info_->name.c_str(), this->status_, this->rh_list_.size()));
-    }
 
   if (this->status_ == AAM_SERVER_READY || this->status_ == AAM_SERVER_STARTED_RUNNING)
     {
@@ -98,14 +91,6 @@ AsyncAccessManager::add_interest (ImR_ResponseHandler *rh)
 void
 AsyncAccessManager::final_state (void)
 {
-  if (this->locator_.debug() > 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("(%P|%t) AsyncAccessManager::final_state: ")
-                  ACE_TEXT ("status = %d, server = <%C> list size = %d\n"),
-                  this->status_, this->info_->name.c_str(), rh_list_.size()));
-    }
-
   for (size_t i = 0; i < this->rh_list_.size(); i++)
     {
       ImR_ResponseHandler *rh = this->rh_list_[i];
@@ -168,13 +153,6 @@ AsyncAccessManager::status (AAM_Status s)
 void
 AsyncAccessManager::activator_replied (bool success)
 {
-  if (this->locator_.debug() > 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("(%P|%t) AsyncAccessManager::activator_replied: ")
-                  ACE_TEXT ("success = %d, status = %d\n"),
-                  success, this->status_));
-    }
   if (success)
     {
       this->status (AAM_WAIT_FOR_RUNNING);
@@ -196,13 +174,6 @@ AsyncAccessManager::server_is_shutting_down (void)
 void
 AsyncAccessManager::server_is_running (const char *partial_ior)
 {
-  if (this->locator_.debug() > 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("(%P|%t) AsyncAccessManager::server_is_running: ")
-                  ACE_TEXT ("name = %C, status = %d\n"),
-                  this->info_->name.c_str(), this->status_));
-    }
   this->status (AAM_WAIT_FOR_ALIVE);
   this->info_->partial_ior = partial_ior;
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp
index 173da901042..3528ad269a2 100644
--- a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp
@@ -44,11 +44,6 @@ INS_Locator::async_locate (::IORTable::Locate_ResponseHandler handler,
 {
   ACE_ASSERT (object_key != 0);
 
-  if (imr_locator_.debug () > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("ImR: Activating server <%s> asynchronously .\n"),
-                object_key));
-
   Server_Info_Ptr si;
   ACE_CString key;
   ACE_CString full (object_key);
@@ -60,8 +55,6 @@ INS_Locator::async_locate (::IORTable::Locate_ResponseHandler handler,
     }
   else
     {
-      ACE_DEBUG ((LM_DEBUG, "async_locate: split key failed!\n"));
-
       handler->raise_excep (CORBA::TRANSIENT (CORBA::SystemException::_tao_minor_code
                                               (TAO_IMPLREPO_MINOR_CODE, 0),
                                               CORBA::COMPLETED_NO));
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
index 55c4fa3d0c5..b566e2df7b3 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
@@ -520,9 +520,8 @@ ImR_Locator_i::activate_server_i (UpdateableServerInfo& info,
       AsyncAccessManager *aam_raw;
       ACE_NEW (aam_raw, AsyncAccessManager (*info, manual_start, *this));
       aam = aam_raw;
-      int result = this->aam_set_.insert (aam);
-      ACE_DEBUG ((LM_DEBUG, "ImR_Locator_i::activate_server_i(PC) insert_aam returned %d\n", result));
-    }
+      this->aam_set_.insert (aam);
+  }
   else
     {
       aam = this->find_aam (info->name.c_str());
@@ -531,13 +530,10 @@ ImR_Locator_i::activate_server_i (UpdateableServerInfo& info,
           AsyncAccessManager *aam_raw;
           ACE_NEW (aam_raw, AsyncAccessManager (*info, manual_start, *this));
           aam = aam_raw;
-          ACE_DEBUG ((LM_DEBUG, "ImR_Locator_i::activate_server_i calling insert_aam size = %d\n", aam_set_.size()));
-          int result = this->aam_set_.insert_tail (aam);
-          ACE_DEBUG ((LM_DEBUG, "ImR_Locator_i::activate_server_i after insert_aam size = %d returned %d\n", aam_set_.size(), result));
+          this->aam_set_.insert_tail (aam);
         }
     }
   aam->add_interest (rh);
-  ACE_DEBUG ((LM_DEBUG, "ImR_Locator_i::activate_server_i returning\n"));
 }
 
 CORBA::Object_ptr
@@ -951,8 +947,7 @@ ImR_Locator_i::server_is_running
       ACE_NEW (aam_raw, AsyncAccessManager (*temp_info, true, *this));
       AsyncAccessManager_ptr aam (aam_raw);
       aam->started_running ();
-      int result = this->aam_set_.insert (aam);
-      ACE_DEBUG ((LM_DEBUG, "ImR_Locator_i::server_is_running insert_aam returned %d\n", result));
+      this->aam_set_.insert (aam);
     }
   else
     {
@@ -980,14 +975,11 @@ ImR_Locator_i::server_is_running
         aam->server_is_running (partial_ior);
       else
         {
-          ACE_DEBUG ((LM_DEBUG, "Server_Is_Running, %s not found in aam set\n",
-                      name.c_str()));
           AsyncAccessManager *aam_raw;
           ACE_NEW (aam_raw, AsyncAccessManager (*info, true, *this));
           AsyncAccessManager_ptr aam (aam_raw);
           aam->started_running ();
-          int result = this->aam_set_.insert (aam);
-          ACE_DEBUG ((LM_DEBUG, "ImR_Locator_i::server_is_running insert_aam returned %d\n", result));
+          this->aam_set_.insert (aam);
         }
     }
   _tao_rh->server_is_running ();
@@ -1345,16 +1337,13 @@ ImR_Locator_i::root_poa (void)
 void
 ImR_Locator_i::remove_aam (AsyncAccessManager_ptr &aam)
 {
-  ACE_DEBUG ((LM_DEBUG, "ImR_Locator_i::remove_aam calling remove\n"));
-  int result = this->aam_set_.remove (aam);
-  ACE_DEBUG ((LM_DEBUG, "ImR_Locator_i::remove_aam, remove returned %d\n", result));
+  this->aam_set_.remove (aam);
 
 }
 
 AsyncAccessManager *
 ImR_Locator_i::find_aam (const char *name)
 {
-  ACE_DEBUG ((LM_DEBUG, "ImR_Locator_i::find_aam called for %s, set size = %d\n", name, aam_set_.size()));
 
   for (AAM_Set::ITERATOR i = this->aam_set_.begin();
        i != this->aam_set_.end();
@@ -1362,7 +1351,6 @@ ImR_Locator_i::find_aam (const char *name)
     {
       if ((*i)->has_server (name))
         {
-          ACE_DEBUG ((LM_DEBUG, "ImR_Locator_i::find_aam add ref and return\n"));
           return (*i)->add_ref();
         }
     }
@@ -1436,7 +1424,6 @@ ImR_SyncResponseHandler::~ImR_SyncResponseHandler (void)
 void
 ImR_SyncResponseHandler::send_ior (const char *pior)
 {
-  ACE_DEBUG ((LM_DEBUG,"ImR_SyncResponseHandler send_ior called\n"));
   ACE_CString full (pior);
   full += this->key_;
   this->result_ = full.c_str();
@@ -1479,7 +1466,6 @@ ImR_Loc_ResponseHandler::~ImR_Loc_ResponseHandler (void)
 void
 ImR_Loc_ResponseHandler::send_ior (const char *)
 {
-  ACE_DEBUG ((LM_DEBUG,"ImR_Loc_ResponseHandler send_ior called, opid = %d\n", op_id_));
   switch (this->op_id_)
     {
     case LOC_ACTIVATE_SERVER:
diff --git a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp
index b0d874c2644..a1ad3761eb3 100644
--- a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp
@@ -278,7 +278,7 @@ LiveCheck::~LiveCheck (void)
       LiveEntryMap::value_type *pair = 0;
       i.next (pair);
       this->entry_map_.unbind(pair);
-      delete pair->item();
+      //      delete pair->item();
     }
 }
 
diff --git a/TAO/tao/IORTable/Locate_ResponseHandler.cpp b/TAO/tao/IORTable/Locate_ResponseHandler.cpp
index dc895d3f842..cf36cae1ef2 100644
--- a/TAO/tao/IORTable/Locate_ResponseHandler.cpp
+++ b/TAO/tao/IORTable/Locate_ResponseHandler.cpp
@@ -36,7 +36,7 @@ TAO_AMH_Locate_ResponseHandler::_nil (void)
 TAO_AMH_Locate_ResponseHandler::TAO_AMH_Locate_ResponseHandler (
     TAO_ServerRequest & sr)
   : TAO_AMH_Response_Handler (),
-    orb_ (sr.orb())
+    orb_ (CORBA::ORB::_duplicate (sr.orb()))
 {
   this->init (sr,0);
 }