diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-06-15 12:45:55 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-06-15 12:45:55 +0000 |
| commit | e2d949d7e429681b5386586cf5e5e1e118f1f98f (patch) | |
| tree | b22d003dad64e138bae14cbf0c996b0ec6d759be /CIAO/connectors/dds4ccm/tests/PSLDeadline | |
| parent | 4692c29b8eccbb0ad8e0dafe344b4be687309d46 (diff) | |
| download | ATCD-e2d949d7e429681b5386586cf5e5e1e118f1f98f.tar.gz | |
Tue Jun 15 12:45:14 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h:
* connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp:
* connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h:
* connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp:
* connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp:
* connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender_exec.h:
* connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender_exec.cpp:
* connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h:
* connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp:
* connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.h:
* connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp:
* connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h:
* connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.h:
* connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.cpp:
* connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h:
* connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp:
* connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.h:
* connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp:
* connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.h:
* connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component_exec.h:
* connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component_exec.cpp:
Cleanup, no caching in executors
Diffstat (limited to 'CIAO/connectors/dds4ccm/tests/PSLDeadline')
| -rw-r--r-- | CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp | 8 | ||||
| -rw-r--r-- | CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp index e3528d016b5..7e97d420939 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp @@ -109,21 +109,23 @@ namespace CIAO_PSL_DeadlineTest_Sender_Impl void Sender_exec_i::configuration_complete (void) { - this->writer_ = this->context_->get_connection_test_topic_write_data (); } void Sender_exec_i::tick () { + ::PSL_DeadlineTest::PSLDeadlineConnector::Writer_var writer = + this->context_->get_connection_test_topic_write_data (); + for (PSL_DLTest_Table::iterator i = this->_ktests_.begin (); i != this->_ktests_.end (); ++i) { try { - if (! ::CORBA::is_nil (this->writer_)) + if (! ::CORBA::is_nil (writer.in ())) { - this->writer_->write_one(i->second,::DDS::HANDLE_NIL); + writer->write_one(i->second,::DDS::HANDLE_NIL); i->second->x++; } } diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h index 8d44cf1fbb3..ff1e921f42d 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h @@ -97,7 +97,6 @@ namespace CIAO_PSL_DeadlineTest_Sender_Impl pulse_Generator * ticker_; ::PSL_DeadlineTest::CCM_Sender_Context_var context_; - ::PSL_DeadlineTest::PSLDeadlineConnector::Writer_var writer_; TAO_SYNCH_MUTEX mutex_; typedef std::map<ACE_CString, TestTopic_var> PSL_DLTest_Table; |