diff options
| author | msmit <msmit@remedy.nl> | 2010-11-29 12:30:42 +0000 |
|---|---|---|
| committer | msmit <msmit@remedy.nl> | 2010-11-29 12:30:42 +0000 |
| commit | 4b110bf95d48030ba4b8beec9f9203bd898faa92 (patch) | |
| tree | 54aeaa15fabbf8c97d2bfcbf12c36607ab578e60 | |
| parent | 56944790149f40b3e6d4826bc5a4d60d0a4b1b46 (diff) | |
| download | ATCD-4b110bf95d48030ba4b8beec9f9203bd898faa92.tar.gz | |
Mon Nov 29 12:31:30 UTC 2010 Marcel Smit <msmit@remedy.nl>
* connectors/dds4ccm/impl/ContentFilterSetting.cpp:
* connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp:
Resolved memory leaks regarding QueryFilter.
3 files changed, 15 insertions, 4 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index f196757c4bf..b033b716a91 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,9 @@ +Mon Nov 29 12:31:30 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/impl/ContentFilterSetting.cpp: + * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: + Resolved memory leaks regarding QueryFilter. + Mon Nov 29 11:09:39 UTC 2010 Marijke Hengstmengel <mhengstmengel@remedy.nl> * connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.cpp: @@ -15,7 +21,7 @@ Mon Nov 29 11:09:39 UTC 2010 Marijke Hengstmengel <mhengstmengel@remedy.nl> * connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender_exec.cpp: * connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.cpp: * connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender_exec.cpp: - Delete pointers without checking not o. + Delete pointers without checking not o. Mon Nov 29 10:51:56 UTC 2010 Marcel Smit <msmit@remedy.nl> diff --git a/CIAO/connectors/dds4ccm/impl/ContentFilterSetting.cpp b/CIAO/connectors/dds4ccm/impl/ContentFilterSetting.cpp index 4ed58dc8a44..baad8603dc7 100644 --- a/CIAO/connectors/dds4ccm/impl/ContentFilterSetting.cpp +++ b/CIAO/connectors/dds4ccm/impl/ContentFilterSetting.cpp @@ -23,7 +23,12 @@ namespace CIAO { DDS4CCM_TRACE ("CCM_DDS_ContentFilterSetting_i::filter"); ::CCM_DDS::QueryFilter* retval = new ::CCM_DDS::QueryFilter; - *retval = this->filter_; + retval->expression = ::CORBA::string_dup (this->filter_.expression); + retval->parameters.length (this->filter_.parameters.length ()); + for (::CORBA::ULong i = 0; i < this->filter_.parameters.length (); ++i) + { + retval->parameters[i] = ::CORBA::string_dup (this->filter_.parameters[i]); + } return retval; } diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp index b445784aaed..f0a40e6d494 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp @@ -476,7 +476,7 @@ namespace CIAO_ReadGet_Test_Receiver_Impl void Receiver_exec_i::check_filter_getter (void) { - ::CCM_DDS::QueryFilter * filter = 0; + ::CCM_DDS::QueryFilter_var filter; ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver_exec_i::check_filter <GETTER> - ") ACE_TEXT ("checking filter\n"))); @@ -592,7 +592,7 @@ namespace CIAO_ReadGet_Test_Receiver_Impl void Receiver_exec_i::check_filter_reader (void) { - ::CCM_DDS::QueryFilter * filter = 0; + ::CCM_DDS::QueryFilter_var filter; ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver_exec_i::check_filter <READER> - ") ACE_TEXT ("checking filter\n"))); |