Thu Oct 7 10:59:51 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * COPYING:
          Small fix

        * dance/LocalityManager/Daemon/Locality_Manager_Task.cpp:
          Layout changes

        * dance/LocalityManager/Handler/Plugin_Conf.cpp:
          Fixed memory leak coming from ACE_Read_Buffer::rec_read

4 files changed, 75 insertions, 65 deletions

diff --git a/DAnCE/COPYING b/DAnCE/COPYING
index d1528f811b1..551231de6cf 100644
--- a/DAnCE/COPYING
+++ b/DAnCE/COPYING
@@ -1,10 +1,10 @@
 
      _________________________________________________________________
-   
+
   Copyright and Licensing Information for ACE(TM), TAO(TM), CIAO(TM),
   DAnCE(TM), and CoSMIC(TM)
-  
-   [1]ACE(TM), [2]TAO(TM), [3]CIAO(TM), DAnCE>(TM), and [4]CoSMIC(TM)
+
+   [1]ACE(TM), [2]TAO(TM), [3]CIAO(TM), DAnCE(TM), and [4]CoSMIC(TM)
    (henceforth referred to as "DOC software") are copyrighted by
    [5]Douglas C. Schmidt and his [6]research group at [7]Washington
    University, [8]University of California, Irvine, and [9]Vanderbilt
@@ -17,7 +17,7 @@
    built using DOC software that you release. No copyright statement
    needs to be provided if you just ship binary executables of your
    software products.
-   
+
    You can use DOC software in commercial and/or binary software releases
    and are under no obligation to redistribute any of your source code
    that is built using DOC software. Note, however, that you may not
@@ -28,7 +28,7 @@
    using DOC software in your software, though we encourage you to let
    [10]us know so we can promote your project in the [11]DOC software
    success stories.
-   
+
    The [12]ACE, [13]TAO, [14]CIAO, [15]DAnCE, and [16]CoSMIC web sites
    are maintained by the [17]DOC Group at the [18]Institute for Software
    Integrated Systems (ISIS) and the [19]Center for Distributed Object
@@ -51,7 +51,7 @@
    University, UC Irvine, or Vanderbilt University, their employees, or
    students be liable for any lost revenue or profits or other special,
    indirect and consequential damages.
-   
+
    DOC software is provided with no support and without any obligation on
    the part of Washington University, UC Irvine, Vanderbilt University,
    their employees, or students to assist in its use, correction,
@@ -65,7 +65,7 @@
    obtains time/date and calendaring information from operating systems
    users will not be affected by the new DST rules as long as they
    upgrade their operating systems accordingly.
-   
+
    The names ACE(TM), TAO(TM), CIAO(TM), DAnCE(TM), CoSMIC(TM),
    Washington University, UC Irvine, and Vanderbilt University, may not
    be used to endorse or promote products or services derived from this
@@ -75,13 +75,13 @@
    TAO(TM), CIAO(TM), DAnCE(TM), or CoSMIC(TM), nor does it grant
    permission for the name Washington University, UC Irvine, or
    Vanderbilt University to appear in their names.
-   
+
    If you have any suggestions, additions, comments, or questions, please
    let [21]me know.
-   
+
    [22]Douglas C. Schmidt
      _________________________________________________________________
-   
+
    Back to the [23]ACE home page.
 
 References
diff --git a/DAnCE/ChangeLog b/DAnCE/ChangeLog
index 0cd138bab9a..45169c533c7 100644
--- a/DAnCE/ChangeLog
+++ b/DAnCE/ChangeLog
@@ -1,8 +1,19 @@
+Thu Oct  7 10:59:51 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * COPYING:
+          Small fix
+
+        * dance/LocalityManager/Daemon/Locality_Manager_Task.cpp:
+          Layout changes
+
+        * dance/LocalityManager/Handler/Plugin_Conf.cpp:
+          Fixed memory leak coming from ACE_Read_Buffer::rec_read
+
 Mon Oct  4 14:29:30 UTC 2010  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * tests/LocalityManager/ExplicitExec/ExplicitExec.mpc:
 
-          Removed dependency on CIAO Deployment handlers. 
+          Removed dependency on CIAO Deployment handlers.
 
 Fri Oct  1 16:00:51 UTC 2010  William Otte  <wotte@zifnab>
 
diff --git a/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Task.cpp b/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Task.cpp
index 06c19749471..5015db3df9a 100644
--- a/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Task.cpp
+++ b/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Task.cpp
@@ -65,7 +65,8 @@ namespace DAnCE
     PortableServer::POA_var root_poa =
       PortableServer::POA::_narrow (object.in ());
 
-    PortableServer::POAManager_var poa_manager = root_poa->the_POAManager ();
+    PortableServer::POAManager_var poa_manager =
+      root_poa->the_POAManager ();
 
     poa_manager->activate ();
 
@@ -195,10 +196,9 @@ namespace DAnCE
                      ACE_TEXT ("ORB Event loop completed.\n")));
 
     root_poa->destroy (1, 1);
-    root_poa = ::PortableServer::POA::_nil ();
 
     this->orb_->destroy ();
-    this->orb_ = ::CORBA::ORB::_nil ();
+    this->orb_ = CORBA::ORB::_nil ();
 
     return 0;
   }
diff --git a/DAnCE/dance/LocalityManager/Handler/Plugin_Conf.cpp b/DAnCE/dance/LocalityManager/Handler/Plugin_Conf.cpp
index c932527d921..8ae2686ed25 100644
--- a/DAnCE/dance/LocalityManager/Handler/Plugin_Conf.cpp
+++ b/DAnCE/dance/LocalityManager/Handler/Plugin_Conf.cpp
@@ -49,71 +49,70 @@ namespace DAnCE
       {
         try
           {
-            size_t len = ACE_OS::strlen (string);
+            size_t const len = ACE_OS::strlen (string);
 
-            if (len == 0) continue;
-
-            std::istringstream tokenizer (string);
-            std::vector< std::string > tokens;
-            std::copy (std::istream_iterator< std::string > (tokenizer),
-                       std::istream_iterator <std::string > (),
-                       std::back_inserter < std::vector < std::string > > (tokens));
-
-            if (tokens.size () != 3)
-              {
-                DANCE_ERROR (1, (LM_ERROR, DLINFO
-                                 ACE_TEXT ("Plugin_Configurator::load_from_text_file - ")
-                                 ACE_TEXT ("Skipping line <%C>, wrong format.  Got %u tokens instead of 3\n"),
-                                 string,
-                                 tokens.size ()));
-              }
-            else
+            if (len != 0)
               {
-                DANCE_DEBUG (7, (LM_DEBUG, DLINFO
-                                 ACE_TEXT ("Plugin_Configurator::load_from_text_file - ")
-                                 ACE_TEXT ("Attempting to load plugin of type <%C>, artifact <%C>, entrypoint <%C>\n"),
-                                 tokens[0].c_str (),
-                                 tokens[1].c_str (),
-                                 tokens[2].c_str ()));
-
+                std::istringstream tokenizer (string);
+                std::vector< std::string > tokens;
+                std::copy (std::istream_iterator< std::string > (tokenizer),
+                          std::istream_iterator <std::string > (),
+                          std::back_inserter < std::vector < std::string > > (tokens));
 
-                if (ACE_OS::strcmp (tokens[0].c_str (),
-                                    DAnCE::DANCE_INSTALLATIONHANDLER) == 0)
-                  {
-                    this->create_entry (tokens[1].c_str (), tokens[2].c_str (),
-                                        DAnCE::DANCE_INSTALLATIONHANDLER,
-                                        plan, pos++);
-                  }
-                else if (ACE_OS::strcmp (tokens[0].c_str (),
-                                         DAnCE::DANCE_DEPLOYMENTINTERCEPTOR) == 0)
-                  {
-                    this->create_entry (tokens[1].c_str (), tokens[2].c_str (),
-                                        DAnCE::DANCE_DEPLOYMENTINTERCEPTOR,
-                                        plan, pos++);
-                  }
-                else if (ACE_OS::strcmp (tokens[0].c_str (),
-                                         DAnCE::DANCE_CONFIGPLUGIN) == 0)
+                if (tokens.size () != 3)
                   {
-                    this->create_entry (tokens[1].c_str (), tokens[2].c_str (),
-                                        DAnCE::DANCE_CONFIGPLUGIN,
-                                        plan, pos++);
+                    DANCE_ERROR (1, (LM_ERROR, DLINFO
+                                    ACE_TEXT ("Plugin_Configurator::load_from_text_file - ")
+                                    ACE_TEXT ("Skipping line <%C>, wrong format.  Got %u tokens instead of 3\n"),
+                                    string,
+                                    tokens.size ()));
                   }
                 else
                   {
-                    DANCE_ERROR (1, (LM_ERROR, DLINFO
-                                     ACE_TEXT ("Plugin_Configurator::load_from_text_file - ")
-                                     ACE_TEXT ("Skipping line <%C>, bad type name\n"),
-                                     string));
+                    DANCE_DEBUG (7, (LM_DEBUG, DLINFO
+                                    ACE_TEXT ("Plugin_Configurator::load_from_text_file - ")
+                                    ACE_TEXT ("Attempting to load plugin of type <%C>, artifact <%C>, entrypoint <%C>\n"),
+                                    tokens[0].c_str (),
+                                    tokens[1].c_str (),
+                                    tokens[2].c_str ()));
+
+
+                    if (ACE_OS::strcmp (tokens[0].c_str (),
+                                        DAnCE::DANCE_INSTALLATIONHANDLER) == 0)
+                      {
+                        this->create_entry (tokens[1].c_str (), tokens[2].c_str (),
+                                            DAnCE::DANCE_INSTALLATIONHANDLER,
+                                            plan, pos++);
+                      }
+                    else if (ACE_OS::strcmp (tokens[0].c_str (),
+                                            DAnCE::DANCE_DEPLOYMENTINTERCEPTOR) == 0)
+                      {
+                        this->create_entry (tokens[1].c_str (), tokens[2].c_str (),
+                                            DAnCE::DANCE_DEPLOYMENTINTERCEPTOR,
+                                            plan, pos++);
+                      }
+                    else if (ACE_OS::strcmp (tokens[0].c_str (),
+                                            DAnCE::DANCE_CONFIGPLUGIN) == 0)
+                      {
+                        this->create_entry (tokens[1].c_str (), tokens[2].c_str (),
+                                            DAnCE::DANCE_CONFIGPLUGIN,
+                                            plan, pos++);
+                      }
+                    else
+                      {
+                        DANCE_ERROR (1, (LM_ERROR, DLINFO
+                                        ACE_TEXT ("Plugin_Configurator::load_from_text_file - ")
+                                        ACE_TEXT ("Skipping line <%C>, bad type name\n"),
+                                        string));
+                      }
                   }
               }
-
-            reader.alloc ()->free (string);
           }
         catch (...)
           {
-            reader.alloc ()->free (string);
             throw;
           }
+        reader.alloc ()->free (string);
       }
 
     this->deploy_plan (plan);