diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-02-28 19:27:38 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-02-28 19:27:38 +0000 |
| commit | 7f8dcf8a99a0658d0d54a17b836b0650cf73b387 (patch) | |
| tree | 62bff5f0ee05681e82a1ed0f15f76b716d4e6f50 | |
| parent | 17619ce9c6ee69da967a198d29cbb94699c999b4 (diff) | |
| download | ATCD-7f8dcf8a99a0658d0d54a17b836b0650cf73b387.tar.gz | |
Tue Feb 28 19:26:48 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* connectors/dds4ccm/impl/Getter_T.cpp:
* connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.cpp:
* connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.cpp:
Fixed coverity errors
4 files changed, 16 insertions, 3 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index b4b7ec4c5b1..9f3e2470dd5 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,10 @@ +Tue Feb 28 19:26:48 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> + + * connectors/dds4ccm/impl/Getter_T.cpp: + * connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.cpp: + * connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.cpp: + Fixed coverity errors + Thu Feb 23 14:16:48 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> * tests/DAnCE/LocalityManager/CommandlinePassage/Component_OpenMode.cdp: diff --git a/CIAO/connectors/dds4ccm/impl/Getter_T.cpp b/CIAO/connectors/dds4ccm/impl/Getter_T.cpp index 13e5d5bda95..618e07126e0 100644 --- a/CIAO/connectors/dds4ccm/impl/Getter_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/Getter_T.cpp @@ -9,7 +9,8 @@ namespace CIAO { template <typename GETTER_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE> Getter_Base_T<GETTER_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::Getter_Base_T (void) - : time_out_ (), + : condition_manager_ (0), + time_out_ (), max_delivered_data_ (0) { DDS4CCM_TRACE ("Getter_Base_T::Getter_Base_T"); @@ -268,8 +269,11 @@ namespace CIAO throw ::CORBA::INTERNAL (); } this->condition_manager_ = condition_manager; - this->condition_manager_->set_dds_entity (dr); - this->condition_manager_->init_readcondition (); + 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> diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.cpp index 74cdb536681..5cd873dbf19 100644 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.cpp @@ -55,6 +55,7 @@ namespace CIAO_RG_LateBinding_Sender_Impl Sender_exec_i::Sender_exec_i (void) : iterations_ (0) , keys_ (0) + , to_handler_ (0) { } 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 1fa28b59098..8174b96acef 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 @@ -35,6 +35,7 @@ namespace CIAO_RG_ResetTopic_Sender_Impl Sender_exec_i::Sender_exec_i (void) : iterations_ (0) , keys_ (0) + , to_handler_ (0) , topic_name_ (TOPIC_2) , run_(0) , start_key_ (1) |