Thu Aug 28 09:18:06 UTC 2014 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:
        * connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.cpp:
        * connectors/dds4ccm/tests/TypeSupport/main.cpp:
          Fixed valgrind reported memory leaks

7 files changed, 21 insertions, 6 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index e3592c87104..f28a8ea875d 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,13 @@
+Thu Aug 28 09:18:06 UTC 2014  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:
+        * connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.cpp:
+        * connectors/dds4ccm/tests/TypeSupport/main.cpp:
+          Fixed valgrind reported memory leaks
+
 Sun Aug 17 18:52:15 UTC 2014  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp:
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 ff238f96cf7..e2e79ab6be6 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
@@ -348,7 +348,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                                 DDS_NOT_READ_SAMPLE_STATE,
                                 DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE,
                                 DDS_ALIVE_INSTANCE_STATE | DDS_NOT_ALIVE_INSTANCE_STATE,
-                                DDS_String_dup ("iteration > %0 AND iteration < %1"),
+                                "iteration > %0 AND iteration < %1",
                                 parameters_run_1);
   if (!qc) {
     cerr << "RECEIVER: Error creating query condition" << endl;
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 11a59e6c09f..a1b90de2756 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
@@ -39,7 +39,7 @@ void write (DDSDataWriter * writer)
       char key[7];
       QueryConditionTest new_key;
       sprintf (key, "KEY_%d", iter_key);
-      new_key.symbol = DDS_String_dup(key);
+      new_key.symbol = key;
       for (int iter = 1;
           iter < number_of_iterations_ + 1;
           ++iter)
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/ObO_Receiver.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/ObO_Receiver.cpp
index 894bdddd657..a3ddb129183 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/ObO_Receiver.cpp
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/ObO_Receiver.cpp
@@ -362,7 +362,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                                 DDS_NOT_READ_SAMPLE_STATE,
                                 DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE,
                                 DDS_ALIVE_INSTANCE_STATE | DDS_NOT_ALIVE_INSTANCE_STATE,
-                                DDS_String_dup ("iteration > %0 AND iteration < %1"),
+                                "iteration > %0 AND iteration < %1",
                                 parameters_run_1);
   if (!qc) {
     cerr << "RECEIVER: Error creating query condition" << endl;
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/ObO_Sender.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/ObO_Sender.cpp
index 2a34e08326e..1654dbc9aa6 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/ObO_Sender.cpp
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/ObO_Sender.cpp
@@ -39,7 +39,7 @@ void write (DDSDataWriter * writer)
       char key[7];
       QueryConditionTest new_key;
       sprintf (key, "KEY_%d", iter_key);
-      new_key.symbol = DDS_String_dup(key);
+      new_key.symbol = key;
       for (int iter = 1;
           iter < number_of_iterations_ + 1;
           ++iter)
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.cpp
index 8174b96acef..f1ba9cfe889 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.cpp
@@ -108,7 +108,7 @@ namespace CIAO_RG_ResetTopic_Sender_Impl
             throw ::CORBA::INTERNAL ();
           }
 
-        conn->topic_name (::CORBA::string_dup (this->topic_name_.c_str()));
+        conn->topic_name (this->topic_name_.c_str());
 
         ::CORBA::UShort key = 0;
         ::CORBA::UShort iter = 0;
@@ -140,7 +140,7 @@ namespace CIAO_RG_ResetTopic_Sender_Impl
                       "Inform the receiver that all samples were written\n"));
             starter->set_reader_properties (this->start_key_ - 1, this->start_iteration_ - 1);
 
-            starter->start_read (::CORBA::string_dup(this->topic_name_.c_str()));
+            starter->start_read (this->topic_name_.c_str());
           }
         else
           {
diff --git a/CIAO/connectors/dds4ccm/tests/TypeSupport/main.cpp b/CIAO/connectors/dds4ccm/tests/TypeSupport/main.cpp
index 5e99e081ffd..506990133b2 100644
--- a/CIAO/connectors/dds4ccm/tests/TypeSupport/main.cpp
+++ b/CIAO/connectors/dds4ccm/tests/TypeSupport/main.cpp
@@ -264,6 +264,11 @@ ACE_TMAIN (int , ACE_TCHAR **)
       /// No need to delete f1, f2, and f3 since ::close will delete them.
       pf.delete_participant(dp1);
       pf.delete_participant(dp2);
+
+#if (CIAO_DDS4CCM_NDDS==1)
+      DDSDomainParticipantFactory::finalize_instance ();
+#endif
+
     }
   catch (const ::CORBA::Exception& e)
     {