Wed Oct 6 08:31:38 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp:
        * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp:
          layout changes

        * performance-tests/mico:
        * performance-tests/mico/mico-thrput-st:
        * performance-tests/mico/mico-thrput-st/README:
        * performance-tests/mico/mico-thrput-st/RoundTrip:
        * performance-tests/mico/mico-thrput-st/RoundTrip.idl:
        * performance-tests/mico/mico-thrput-st/RoundTrip_impl.cc:
        * performance-tests/mico/mico-thrput-st/RoundTrip_impl.h:
        * performance-tests/mico/mico-thrput-st/client.cc:
        * performance-tests/mico/mico-thrput-st/mico-env:
        * performance-tests/mico/mico-thrput-st/server.cc:
          Removed these files, no idea why we have a mico performance test
          in CIAO

2 files changed, 32 insertions, 32 deletions

diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp
index ac81cb76909..85c020631da 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp
@@ -302,7 +302,7 @@ int ACE_TMAIN (int , ACE_TCHAR *[])
       cerr << "RECEIVER: Error detaching query condition" << endl;
       return clean_up (participant);
     }
-  //delete the query condition from the data reader
+  // Delete the query condition from the data reader
   typed_dr->delete_readcondition (qc);
 
   rc = typed_dr->create_readcondition (
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp
index 26463632afa..97cc84d131a 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp
@@ -461,40 +461,40 @@ namespace CIAO_Updater_Sender_Impl
       ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: AlreadyCreated  with test updater delete_many.\n")));
       result = false;
     }
-    if(result==true)
-    {
-    //delete many with no exception
-    //reset instances to original values
-      for (int i = 1; i < 4; i++)
-        {
-          char key[7];
-          TestTopic new_key;
-          ACE_OS::sprintf (key, "many_%d", i);
-          new_key.key = CORBA::string_dup(key);
-          new_key.x = i;
-          this->topic_seq_many_[i-1] = new_key;
-        }
-      try
+    if (result==true)
       {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_many : deleted <%u> samples\n"),
-                                          this->topic_seq_many_.length ()));
+        // Delete many with no exception
+        // reset instances to original values
+        for (int i = 1; i < 4; i++)
+          {
+            char key[7];
+            TestTopic new_key;
+            ACE_OS::sprintf (key, "many_%d", i);
+            new_key.key = CORBA::string_dup(key);
+            new_key.x = i;
+            this->topic_seq_many_[i-1] = new_key;
+          }
+        try
+        {
+          ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_many : deleted <%u> samples\n"),
+                                            this->topic_seq_many_.length ()));
 
-        this->updater_->delete_many (this->topic_seq_many_);
-        result = true;
-      }
-      catch(const CCM_DDS::NonExistent& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater delete_many\n")));
-        result = false;
-      }
-      catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                   ACE_TEXT ("with test updater delete_many: index <%d> - retval <%d>\n"),
-                   ex.index, ex.error_code));
-        result = false;
+          this->updater_->delete_many (this->topic_seq_many_);
+          result = true;
+        }
+        catch(const CCM_DDS::NonExistent& )
+        {
+          ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater delete_many\n")));
+          result = false;
+        }
+        catch (const CCM_DDS::InternalError& ex)
+        {
+          ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
+                    ACE_TEXT ("with test updater delete_many: index <%d> - retval <%d>\n"),
+                    ex.index, ex.error_code));
+          result = false;
+        }
       }
-    }
     return result;
   }