diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-07-15 19:11:18 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-07-15 19:11:18 +0000 |
| commit | 2fcf2f6c8b9f4b3707a9c27e9e53ac3c820f46ce (patch) | |
| tree | a09bef736a488db68d3e8525332b2fe76a56640d | |
| parent | c1a7715a1f61446035911b552fe6e26d4c14cfe1 (diff) | |
| download | ATCD-2fcf2f6c8b9f4b3707a9c27e9e53ac3c820f46ce.tar.gz | |
Thu Jul 15 19:11:05 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* connectors/dds4ccm/impl/DomainParticipant_T.cpp:
Don't call a dds narrow with 0 pointer, it causes an error to be
logged
| -rw-r--r-- | CIAO/ChangeLog | 6 | ||||
| -rw-r--r-- | CIAO/connectors/dds4ccm/impl/DomainParticipant_T.cpp | 18 |
2 files changed, 21 insertions, 3 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 69673c2718f..a2b7ca81f2b 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,9 @@ +Thu Jul 15 19:11:05 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> + + * connectors/dds4ccm/impl/DomainParticipant_T.cpp: + Don't call a dds narrow with 0 pointer, it causes an error to be + logged + Thu Jul 15 09:48:46 UTC 2010 Marcel Smit <msmit@remedy.nl> * connectors/dds4ccm/impl/DomainParticipant_T.h: diff --git a/CIAO/connectors/dds4ccm/impl/DomainParticipant_T.cpp b/CIAO/connectors/dds4ccm/impl/DomainParticipant_T.cpp index b4d2f39fa7a..a4f8da39ccd 100644 --- a/CIAO/connectors/dds4ccm/impl/DomainParticipant_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DomainParticipant_T.cpp @@ -373,7 +373,11 @@ namespace CIAO DDSTopicDescription * dds_td = this->impl ()->lookup_topicdescription (impl_name); - DDSTopic * dds_tp = DDSTopic::narrow (dds_td); + DDSTopic * dds_tp = 0; + if (dds_td != 0) + { + dds_tp = DDSTopic::narrow (dds_td); + } if (!dds_tp) { @@ -466,7 +470,11 @@ namespace CIAO DDSTopicDescription * dds_td = this->impl ()->lookup_topicdescription (impl_name); - DDSTopic * dds_tp = DDSTopic::narrow (dds_td); + DDSTopic * dds_tp = 0; + if (dds_td != 0) + { + dds_tp = DDSTopic::narrow (dds_td); + } if (!dds_tp) { @@ -530,7 +538,11 @@ namespace CIAO const char * topic_name = a_topic->get_name (); DDSTopicDescription * dds_td = this->impl ()->lookup_topicdescription (topic_name); - DDSTopic * tp = DDSTopic::narrow (dds_td); + DDSTopic * tp = 0; + if (dds_td != 0) + { + tp = DDSTopic::narrow (dds_td); + } if (!tp) { |