Fri Feb 22 22:00:40 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com>

8 files changed, 62 insertions, 42 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 2aaff1f87b6..da360ba6096 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,18 @@
+Fri Feb 22 22:00:40 UTC 2013  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp:
+        * orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp:
+        * orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.cpp:
+        * orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp:
+
+          Clean up debug messages so that they conform to TAO convention.
+
+        * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp:
+
+          Fix a couple of memory leaks.
+
 Fri Feb 22 14:25:37 UTC 2013  Kevin Stanley  <stanleyk@ociweb.com>
 
         * orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.h:
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp
index 77bfa3199e0..7f59dca706c 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp
@@ -185,7 +185,7 @@ TAO_FT_Naming_Manager::groups (::FT_Naming::LoadBalancingStrategyValue target_st
         (*group_names)[i] =
           CORBA::string_dup ("<group without LB property>");
         ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("%T %n (%P|%t) - FT_Naming_Manager::groups: no LB ")
+                    ACE_TEXT ("TAO (%P|%t) - FT_Naming_Manager::groups: no LB ")
                     ACE_TEXT ("property set on group.\n")
                     ));
         continue;
@@ -211,7 +211,7 @@ TAO_FT_Naming_Manager::groups (::FT_Naming::LoadBalancingStrategyValue target_st
         { // Group has no name
           (*group_names)[i] = CORBA::string_dup ("<unnamed group>");
           ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("%T %n (%P|%t) - FT_Naming_Manager::groups: no name ")
+                      ACE_TEXT ("TAO (%P|%t) - FT_Naming_Manager::groups: no name ")
                       ACE_TEXT ("property set on group.\n")
             ));
         }
@@ -248,7 +248,7 @@ TAO_FT_Naming_Manager::group_name (PortableGroup::ObjectGroup_ptr group,
   if (CORBA::is_nil (group))
   {
     ACE_ERROR ((LM_ERROR,
-                ACE_TEXT ("%T %n (%P|%t) - FT_Naming_Manager::group_name: ")
+                ACE_TEXT ("TAO (%P|%t) - FT_Naming_Manager::group_name: ")
                 ACE_TEXT ("cannot get name for a null object.\n")
       ));
     return false;
@@ -381,7 +381,7 @@ TAO_FT_Naming_Manager::create_member (
     if (TAO_debug_level > 0)
     {
       ACE_ERROR ( (LM_ERROR,
-                   ACE_TEXT ("%T %n (%P|%t) - FT_Naming_Manager::create_member: ")
+                   ACE_TEXT ("TAO (%P|%t) - FT_Naming_Manager::create_member: ")
                    ACE_TEXT ("unknown group\n")
         ));
     }
@@ -404,7 +404,7 @@ TAO_FT_Naming_Manager::add_member (
         {
           ACE_ERROR (
             (LM_ERROR,
-             ACE_TEXT ("%T %n (%P|%t) - TAO_FT_Naming_Manager::add_member")
+             ACE_TEXT ("TAO (%P|%t) - TAO_FT_Naming_Manager::add_member")
              ACE_TEXT ("Null object group provided.\n")
              ));
         }
@@ -438,7 +438,7 @@ TAO_FT_Naming_Manager::add_member (
     if (TAO_debug_level > 0)
     {
       ACE_ERROR ( (LM_ERROR,
-                   ACE_TEXT ("%T %n (%P|%t) - FT_Naming_Manager::add_member ")
+                   ACE_TEXT ("TAO (%P|%t) - FT_Naming_Manager::add_member ")
                    ACE_TEXT ("to unknown group\n")
         ));
     }
@@ -459,7 +459,7 @@ TAO_FT_Naming_Manager::remove_member (
         {
           ACE_ERROR (
             (LM_ERROR,
-             ACE_TEXT ("%T %n (%P|%t) - TAO_FT_Naming_Manager::add_member")
+             ACE_TEXT ("TAO (%P|%t) - TAO_FT_Naming_Manager::add_member")
              ACE_TEXT ("Null object group provided.\n")
              ));
         }
@@ -514,7 +514,7 @@ TAO_FT_Naming_Manager::locations_of_members (
     if (TAO_debug_level > 0)
     {
       ACE_ERROR ( (LM_ERROR,
-                   ACE_TEXT ("%T %n (%P|%t) - FT_Naming_Manager::")
+                   ACE_TEXT ("TAO (%P|%t) - FT_Naming_Manager::")
                    ACE_TEXT ("locations_of_members: unknown group\n")
         ));
     }
@@ -555,7 +555,7 @@ TAO_FT_Naming_Manager::get_object_group_id (
     if (TAO_debug_level > 0)
     {
       ACE_ERROR ( (LM_ERROR,
-                   ACE_TEXT ("%T %n (%P|%t) - FT_Naming_Manager::")
+                   ACE_TEXT ("TAO (%P|%t) - FT_Naming_Manager::")
                    ACE_TEXT ("get_object_group_id: unknown group\n")
         ));
     }
@@ -589,7 +589,7 @@ TAO_FT_Naming_Manager::get_object_group_ref (
     if (TAO_debug_level > 0)
     {
       ACE_ERROR ( (LM_ERROR,
-                   ACE_TEXT ("%T %n (%P|%t) - FT_Naming_Manager::")
+                   ACE_TEXT ("TAO (%P|%t) - FT_Naming_Manager::")
                    ACE_TEXT ("get_object_group_ref: unknown group\n")
         ));
     }
@@ -614,7 +614,7 @@ PortableGroup::ObjectGroup_ptr TAO_FT_Naming_Manager::get_object_group_ref_from_
     if (TAO_debug_level > 0)
     {
       ACE_ERROR ( (LM_ERROR,
-                   ACE_TEXT ("%T %n (%P|%t) - FT_Naming_Manager::")
+                   ACE_TEXT ("TAO (%P|%t) - FT_Naming_Manager::")
                    ACE_TEXT ("get_object_group_ref_from_id: unknown group\n")
         ));
     }
@@ -650,7 +650,7 @@ TAO_FT_Naming_Manager::get_member_ref (
     if (TAO_debug_level > 0)
     {
       ACE_ERROR ( (LM_ERROR,
-                   ACE_TEXT ("%T %n (%P|%t) - FT_Naming_Manager::")
+                   ACE_TEXT ("TAO (%P|%t) - FT_Naming_Manager::")
                    ACE_TEXT ("get_member_ref: unknown group\n")
         ));
     }
@@ -755,7 +755,7 @@ TAO_FT_Naming_Manager::next_member (PortableGroup::ObjectGroup_ptr object_group)
         {
           ACE_ERROR (
             (LM_ERROR,
-             ACE_TEXT ("%T %n (%P|%t) - TAO_FT_Naming_Manager::add_member")
+             ACE_TEXT ("TAO (%P|%t) - TAO_FT_Naming_Manager::add_member")
              ACE_TEXT ("Null object group provided.\n")
              ));
         }
@@ -781,7 +781,7 @@ TAO_FT_Naming_Manager::next_member (PortableGroup::ObjectGroup_ptr object_group)
   if (!found)
   {
     ACE_ERROR ((LM_ERROR,
-                ACE_TEXT ("%T %n (%P|%t) - TAO_FT_Naming_Manager::next_member: ")
+                ACE_TEXT ("TAO (%P|%t) - TAO_FT_Naming_Manager::next_member: ")
                 ACE_TEXT ("object group has no TAO_FT_LOAD_BALANCING_STRATEGY ")
                 ACE_TEXT ("property.\n")
                ));
@@ -804,7 +804,7 @@ TAO_FT_Naming_Manager::next_member (PortableGroup::ObjectGroup_ptr object_group)
     break;
   default:
     ACE_ERROR ((LM_ERROR,
-                ACE_TEXT ("%T %n (%P|%t) - TAO_FT_Naming_Manager::next_location: ")
+                ACE_TEXT ("TAO (%P|%t) - TAO_FT_Naming_Manager::next_location: ")
                 ACE_TEXT ("unsupported load balancing strategy requested.\n")
                ));
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp
index 9958e3a0230..ac11469f585 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp
@@ -1086,9 +1086,9 @@ TAO_FT_Naming_Server::update_object_group (
       if (TAO_debug_level > 3)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("%T %n (%P|%t) - ")
+                      ACE_TEXT ("(%P|%t) - ")
                       ACE_TEXT ("An update of object group with ID %lld ")
-                      ACE_TEXT ("has been made by the peer"),
+                      ACE_TEXT ("has been made by the peer\n"),
                       group_info.id
                       ));
         }
@@ -1099,7 +1099,7 @@ TAO_FT_Naming_Server::update_object_group (
       ACE_ERROR ((LM_ERROR,
                   ACE_TEXT ("(%P|%t) ERROR: Attempting to update object group ")
                   ACE_TEXT ("as stale with obect group persistence not ")
-                  ACE_TEXT ("enabled.")));
+                  ACE_TEXT ("enabled.\n")));
       return -1;
     }
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.cpp
index 3e982c66621..5662589c435 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.cpp
@@ -43,10 +43,10 @@ TAO::FT_PG_Group_Factory::set_object_group_stale (
               if (group_info.change_type == FT_Naming::DELETED)
                 change_type_str = "deleted";
                 ACE_DEBUG ((LM_DEBUG,
-                            ACE_TEXT ("%T %n (%P|%t) - FT_PG_Group_Factory: ")
+                            ACE_TEXT ("TAO (%P|%t) - FT_PG_Group_Factory: ")
                             ACE_TEXT ("Setting list store as stale "),
                             ACE_TEXT ("because of group with ID %lld "),
-                            ACE_TEXT ("was %s"),
+                            ACE_TEXT ("was %s\n"),
                             group_id, change_type_str.c_str ()
                             ));
             }
@@ -64,7 +64,7 @@ TAO::FT_PG_Group_Factory::set_object_group_stale (
       if (!og)
         {
           ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("%T %n (%P|%t) - FT_PG_Group_Factory ")
+                      ACE_TEXT ("TAO (%P|%t) - FT_PG_Group_Factory ")
                       ACE_TEXT ("In setting object group stale could not cast ")
                       ACE_TEXT ("to FT_PG_Object_Group_Storable\n")));
           throw CORBA::INTERNAL ();
@@ -73,8 +73,8 @@ TAO::FT_PG_Group_Factory::set_object_group_stale (
       if (TAO_debug_level > 3)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("%T %n (%P|%t) - ")
-                      ACE_TEXT ("Setting object group with ID %lld as stale"),
+                      ACE_TEXT ("TAO (%P|%t) - ")
+                      ACE_TEXT ("Setting object group with ID %lld as stale\n"),
                       group_id
                       ));
         }
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp
index 4617755347d..4805d59e007 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp
@@ -87,9 +87,9 @@ TAO::FT_PG_Object_Group_Storable::propagate_update_notification
     if (TAO_debug_level > 3)
       {
         ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("%T %n (%P|%t) - ")
+                    ACE_TEXT ("TAO (%P|%t) - propagate_update_notification ")
                     ACE_TEXT ("Notifying peer that object group with ID %lld ")
-                    ACE_TEXT ("has been updated"), object_group_info.id
+                    ACE_TEXT ("has been updated\n"), object_group_info.id
                     ));
       }
     peer->notify_updated_object_group (object_group_info);
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
index 92acae2d28a..29154fadaa7 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
@@ -112,7 +112,7 @@ TAO::PG_Object_Group::~PG_Object_Group (void)
                 this->group_name_));
 
   CORBA::string_free (this->group_name_);
-
+  CORBA::string_free (this->type_id_._retn());
   this->clear_members_map ();
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp
index 1661dd3d3c7..e8f36c2909d 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp
@@ -13,21 +13,21 @@ namespace
   template <typename T>
   void read_cdr (TAO::Storable_Base & stream, T & corba_data)
   {
-  int size;
-  stream >> size;
-
-  char *tmp = 0;
-  ACE_NEW_THROW_EX (tmp, char [size], CORBA::NO_MEMORY ());
-  ACE_Auto_Basic_Array_Ptr<char> buf (tmp);
-  stream.read (size, buf.get ());
-
-  TAO_InputCDR cdr (buf.get (), size);
-  cdr >> corba_data;
-  if (!cdr.good_bit ())
-    {
-      stream.clear ();
-      throw CORBA::INTERNAL ();
-    }
+    int size;
+    stream >> size;
+
+    char *tmp = 0;
+    ACE_NEW_THROW_EX (tmp, char [size], CORBA::NO_MEMORY ());
+    ACE_Auto_Basic_Array_Ptr<char> buf (tmp);
+    stream.read (size, buf.get ());
+
+    TAO_InputCDR cdr (buf.get (), size);
+    cdr >> corba_data;
+    if (!cdr.good_bit ())
+      {
+        stream.clear ();
+        throw CORBA::INTERNAL ();
+      }
   }
 }
 
@@ -408,7 +408,11 @@ TAO::PG_Object_Group_Storable::read (TAO::Storable_Base & stream)
   read_cdr (stream, this->tagged_component_);
 
   ///// type_id_ /////
-  read_cdr(stream, this->type_id_);
+  // special note: A memory leak appears when the type_id_ is read into directly.
+  // reading into a temporary string and handing that to the type_id_ does not leak.
+  CORBA::String_var tmp;
+  read_cdr(stream, tmp);
+  this->type_id_ = tmp._retn();
 
   ///// properties_ /////
   PortableGroup::Criteria properties;
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp
index ede4d544d03..d44932fba6c 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp
@@ -51,6 +51,7 @@ TAO::PG_Property_Set::PG_Property_Set (
 TAO::PG_Property_Set::~PG_Property_Set ()
 {
   this->clear ();
+  delete defaults_;
 }
 
 void