diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-07-23 19:24:54 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-07-23 19:24:54 +0000 |
| commit | 1a5b1bc61e8dda0f2cf08100191276980214ac20 (patch) | |
| tree | b24f20c12646b9d91df61406f5de4c0f09452d4d /CIAO | |
| parent | 583de70bd541c0fa392efa6f4dd8bb760c085d91 (diff) | |
| download | ATCD-1a5b1bc61e8dda0f2cf08100191276980214ac20.tar.gz | |
Mon Jul 23 19:24:09 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp:
* connectors/dds4ccm/impl/Getter_T.cpp:
Init the condition manager from subscriber base instead from
the
getter
Diffstat (limited to 'CIAO')
| -rw-r--r-- | CIAO/ChangeLog | 7 | ||||
| -rw-r--r-- | CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp | 1 | ||||
| -rw-r--r-- | CIAO/connectors/dds4ccm/impl/Getter_T.cpp | 9 |
3 files changed, 9 insertions, 8 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 88f2b44069d..4f956528c40 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,10 @@ +Mon Jul 23 19:24:09 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> + + * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: + * connectors/dds4ccm/impl/Getter_T.cpp: + Init the condition manager from subscriber base instead from the + getter + Mon Jul 23 18:47:26 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> * connectors/dds4ccm/impl/ConditionManager.h: diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp index 288d5d1f6c2..b13387eb114 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp @@ -146,6 +146,7 @@ DDS_Subscriber_Base_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::c this->dds_read_->set_dds_reader (dr.in (), &this->condition_manager_); this->ccm_data_reader_->set_dds_entity (dr.in ()); this->condition_manager_.set_dds_entity (dr.in ()); + this->condition_manager_.init_readcondition (); DDS::ReturnCode_t const retcode = dr->enable (); if (retcode != ::DDS::RETCODE_OK) diff --git a/CIAO/connectors/dds4ccm/impl/Getter_T.cpp b/CIAO/connectors/dds4ccm/impl/Getter_T.cpp index a1b2e604ed0..5b19114abc0 100644 --- a/CIAO/connectors/dds4ccm/impl/Getter_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/Getter_T.cpp @@ -261,11 +261,6 @@ namespace CIAO throw ::CORBA::INTERNAL (); } this->condition_manager_ = condition_manager; - if (this->condition_manager_) - { - this->condition_manager_->set_dds_entity (dr); - this->condition_manager_->init_readcondition (); - } } template <typename GETTER_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE> @@ -298,9 +293,7 @@ namespace CIAO ::DDS::SampleInfoSeq sample_info; SEQ_VALUE_TYPE data; - ::DDS::ReturnCode_t const retcode = this->get (data, - sample_info, - 1); + ::DDS::ReturnCode_t const retcode = this->get (data, sample_info, 1); if (retcode == ::DDS::RETCODE_NO_DATA) { |