diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-07-26 16:30:32 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-07-26 16:30:32 +0000 |
| commit | 0bf1f9a60dc2f8996c9f9445c2d2f52944f2262a (patch) | |
| tree | 5629fdeda42a775b771b166e132047e11deccae6 /CIAO/connectors/dds4ccm/tests | |
| parent | c37e7076eaad2b690ba564e9311f148fa5a082e8 (diff) | |
| download | ATCD-0bf1f9a60dc2f8996c9f9445c2d2f52944f2262a.tar.gz | |
Thu Jul 26 16:29:47 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp:
One return path
* etc/ciao.doxygen:
* etc/ciao_dds4ccm.doxygen:
Upgraded to latest doxygen
Diffstat (limited to 'CIAO/connectors/dds4ccm/tests')
| -rw-r--r-- | CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp | 47 |
1 files changed, 23 insertions, 24 deletions
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp index 0169d62a3fe..4d9664add39 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp @@ -219,36 +219,35 @@ namespace CIAO_PSL_SampleLost_Receiver_Impl ::PSL_SampleLost::PSL_SampleLostConnector::Reader_var reader = this->ciao_context_->get_connection_info_out_data (); - if (::CORBA::is_nil (reader.in ())) + if (!::CORBA::is_nil (reader.in ())) { - return; - } - TestTopicSeq TestTopic_infos; - ::CCM_DDS::ReadInfoSeq readinfoseq; - try - { - reader->read_all(TestTopic_infos, readinfoseq); - for(CORBA::ULong i = 0; i < readinfoseq.length(); ++i) + TestTopicSeq TestTopic_infos; + ::CCM_DDS::ReadInfoSeq readinfoseq; + try { - ACE_Time_Value tv; - tv <<= readinfoseq[i].source_timestamp; - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL ReadInfo ") - ACE_TEXT ("-> UTC date =%#T\n"), - &tv)); + reader->read_all(TestTopic_infos, readinfoseq); + for(CORBA::ULong i = 0; i < readinfoseq.length(); ++i) + { + ACE_Time_Value tv; + tv <<= readinfoseq[i].source_timestamp; + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL ReadInfo ") + ACE_TEXT ("-> UTC date =%#T\n"), + &tv)); + } + for(CORBA::ULong i = 0; i < TestTopic_infos.length(); ++i) + { + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL keyed test info : ") + ACE_TEXT ("Number <%d> : received TestTopic_info for <%C> at %u\n"), + i, + TestTopic_infos[i].key.in (), + TestTopic_infos[i].x)); + } } - for(CORBA::ULong i = 0; i < TestTopic_infos.length(); ++i) + catch (const CCM_DDS::InternalError& ) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL keyed test info : ") - ACE_TEXT ("Number <%d> : received TestTopic_info for <%C> at %u\n"), - i, - TestTopic_infos[i].key.in (), - TestTopic_infos[i].x)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("internal error or no data\n"))); } } - catch (const CCM_DDS::InternalError& ) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("internal error or no data\n"))); - } } // Component attributes and port operations. |