Sat Aug 28 20:38:42 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu>

        * DAnCE/LocalityManager/Daemon/Locality_Manager_Task.cpp:
        * DAnCE/LocalityManager/Handler/Plugin_Conf.cpp:
        * DAnCE/tests/CIAO/Executor-Destructor/Exec_Dest_Status.cpp:
        * DAnCE/tests/CIAO/Executor-Destructor/Executor_Destructor_Interceptor.h:

          Fuzz.

5 files changed, 73 insertions, 63 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index fd6d30caba4..7457fa3a878 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,12 @@
+Sat Aug 28 20:38:42 UTC 2010  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * DAnCE/LocalityManager/Daemon/Locality_Manager_Task.cpp:
+        * DAnCE/LocalityManager/Handler/Plugin_Conf.cpp:
+        * DAnCE/tests/CIAO/Executor-Destructor/Exec_Dest_Status.cpp:
+        * DAnCE/tests/CIAO/Executor-Destructor/Executor_Destructor_Interceptor.h:
+
+          Fuzz.
+
 Sat Aug 28 09:56:52 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * examples/DevGuideExamples/Messenger/History_exec_i.cpp:
diff --git a/CIAO/DAnCE/LocalityManager/Daemon/Locality_Manager_Task.cpp b/CIAO/DAnCE/LocalityManager/Daemon/Locality_Manager_Task.cpp
index 87ab6c70643..3299cff5b58 100644
--- a/CIAO/DAnCE/LocalityManager/Daemon/Locality_Manager_Task.cpp
+++ b/CIAO/DAnCE/LocalityManager/Daemon/Locality_Manager_Task.cpp
@@ -140,7 +140,7 @@ namespace DAnCE
             {
               DANCE_ERROR (1, (LM_CRITICAL, ACE_TEXT ("LocalityManager_Task::run - ")
                                ACE_TEXT ("Out of memory error while allocating config ")
-			       ACE_TEXT ("values.")));
+                               ACE_TEXT ("values.")));
             }
           else
             {
diff --git a/CIAO/DAnCE/LocalityManager/Handler/Plugin_Conf.cpp b/CIAO/DAnCE/LocalityManager/Handler/Plugin_Conf.cpp
index 509b8cf4405..621ad1a0ab9 100644
--- a/CIAO/DAnCE/LocalityManager/Handler/Plugin_Conf.cpp
+++ b/CIAO/DAnCE/LocalityManager/Handler/Plugin_Conf.cpp
@@ -47,73 +47,73 @@ namespace DAnCE
     // Read from the file line by line
     while ((string = reader.read ('\n')) != 0)
       {
-	try
-	  {
-	    size_t len = ACE_OS::strlen (string);
+        try
+          {
+            size_t len = ACE_OS::strlen (string);
 
-	    if (len == 0) continue;
+            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));
+            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
-	      {
-		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 (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
+              {
+                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));
-		  }
-	      }
+                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);
+          }
+        catch (...)
+          {
+            reader.alloc ()->free (string);
+            throw;
+          }
       }
 
     this->deploy_plan (plan);
diff --git a/CIAO/DAnCE/tests/CIAO/Executor-Destructor/Exec_Dest_Status.cpp b/CIAO/DAnCE/tests/CIAO/Executor-Destructor/Exec_Dest_Status.cpp
index 8e346b9d98a..c725a82710b 100644
--- a/CIAO/DAnCE/tests/CIAO/Executor-Destructor/Exec_Dest_Status.cpp
+++ b/CIAO/DAnCE/tests/CIAO/Executor-Destructor/Exec_Dest_Status.cpp
@@ -1,3 +1,4 @@
+// $Id$
 #include "Exec_Dest_Status.h"
 
 #include "Deployment/Deployment_DeploymentPlanC.h"
diff --git a/CIAO/DAnCE/tests/CIAO/Executor-Destructor/Executor_Destructor_Interceptor.h b/CIAO/DAnCE/tests/CIAO/Executor-Destructor/Executor_Destructor_Interceptor.h
index 1739f3b8c94..b4493a76917 100644
--- a/CIAO/DAnCE/tests/CIAO/Executor-Destructor/Executor_Destructor_Interceptor.h
+++ b/CIAO/DAnCE/tests/CIAO/Executor-Destructor/Executor_Destructor_Interceptor.h
@@ -2,7 +2,7 @@
 // $Id$
 
 /**
- * @file DAnCE_DeploymentInterceptors_Base_Impl.h
+ * @file Executor_Destructor_Interceptor.h
  *
  * Base, no-op interceptor.  
  **/