Thu Apr 7 18:48:55 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>

        * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp:
        * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp:
        * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/ObO_Receiver.cpp:
        * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/ObO_Sender.cpp:
          Fixed valgrind memory leaks

2 files changed, 4 insertions, 4 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 4bf19ed16f8..89ff5169e89 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
@@ -243,12 +243,13 @@ int clean_up (DDSDomainParticipant * participant)
       main_result = 1;
     }
   }
+  delete ws_;
+  DDSDomainParticipantFactory::finalize_instance ();
   return main_result;
 }
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  int                 main_result = 1; /* error by default */
   DDSTopic*           topic = 0;
   DDSDataReader*      data_reader = 0;
   DDSSubscriber*      sub = 0;
@@ -412,7 +413,5 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   read (data_reader, qc, rc, ++run);
 
-  main_result = 0;
-
-  return main_result;
+  return clean_up (participant);
 }
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp
index d470f5dbebd..2e862a82198 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp
@@ -165,6 +165,7 @@ clean_exit:
             main_result = 1;
         }
     }
+    DDSDomainParticipantFactory::finalize_instance ();
     return main_result;
 }