diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-10-02 17:31:34 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-10-02 17:31:34 +0000 |
| commit | 40e246fa6f54a84618e403e9c3c34ed720e80a96 (patch) | |
| tree | aa10db4a3c896b2e9517b481bc5830a0379a662c | |
| parent | 7212bedcb0d72abe2e3f3778e1884142bf330fa7 (diff) | |
| download | ATCD-40e246fa6f54a84618e403e9c3c34ed720e80a96.tar.gz | |
Tue Oct 2 17:29:33 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* connectors/dds4ccm/impl/ndds/DataReader_T.cpp:
Only call the RTI narrow with a valid pointer, calling it with
null causes RTI to log an error
| -rw-r--r-- | CIAO/ChangeLog | 6 | ||||
| -rw-r--r-- | CIAO/connectors/dds4ccm/impl/ndds/DataReader_T.cpp | 11 |
2 files changed, 15 insertions, 2 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 6d987e6b0aa..39a6b296c9a 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,9 @@ +Tue Oct 2 17:29:33 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> + + * connectors/dds4ccm/impl/ndds/DataReader_T.cpp: + Only call the RTI narrow with a valid pointer, calling it with + null causes RTI to log an error + Tue Oct 2 08:27:28 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> * ciao/Containers/Container_Base_T.cpp: diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReader_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataReader_T.cpp index 0f7c193e26d..eb2017a5572 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataReader_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReader_T.cpp @@ -982,9 +982,16 @@ namespace CIAO DataReader_T <TYPED_DDS_READER, TYPED_READER_TYPE, VALUE_TYPE, SEQ_TYPE, RTI_SEQ_TYPE>::set_rti_entity ( ::DDSDataReader* dr, ::DDS::DomainParticipant_ptr dp) { - DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::set_impl"); + DDS4CCM_TRACE ("CIAO::NDDS::DataReader_T::set_rti_entity"); - this->rti_entity_ = TYPED_DDS_READER::narrow (dr); + if (dr) + { + this->rti_entity_ = TYPED_DDS_READER::narrow (dr); + } + else + { + this->rti_entity_ = 0; + } this->dp_ = ::DDS::DomainParticipant::_duplicate (dp); } |