From b8b9c36d3b35be5459bd906077a052e08f4b01c4 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 15 Jun 2010 06:46:39 +0000 Subject: Tue Jun 15 06:44:53 UTC 2010 Johnny Willemsen * connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.h: * connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.cpp: * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.h: * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp: * connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component_exec.cpp: * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp: * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp: * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.cpp: * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.cpp: * connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.cpp: * connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.h: * connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp: * connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.h: * connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.cpp: * connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.h: * connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.cpp: * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp: * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.h: * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.cpp: Various layout changes, memory leaks, and code cleanup --- .../Receiver/State_Connection_Test_Receiver_exec.cpp | 8 ++------ .../Sender/State_Connection_Test_Sender_exec.cpp | 8 ++++---- .../Sender/State_Connection_Test_Sender_exec.h | 4 ---- 3 files changed, 6 insertions(+), 14 deletions(-) (limited to 'CIAO/connectors/dds4ccm/tests/State_Connection_Test') diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp index 0b5f6f35b32..464cecd6d98 100644 --- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp @@ -61,9 +61,7 @@ namespace CIAO_State_Connection_Test_Receiver_Impl } //Provides for DDS_Listen - ::State_Connection_Test - ::State_ConnectionTestConnector - ::CCM_Listener_ptr + ::State_Connection_Test::State_ConnectionTestConnector::CCM_Listener_ptr Receiver_exec_i::get_info_listen_data_listener () { this->listen_data_listener_created_ = true; @@ -80,9 +78,7 @@ namespace CIAO_State_Connection_Test_Receiver_Impl } //Provides for DDS_StateListen - ::State_Connection_Test - ::State_ConnectionTestConnector - ::CCM_StateListener_ptr + ::State_Connection_Test::State_ConnectionTestConnector::CCM_StateListener_ptr Receiver_exec_i::get_info_statelisten_data_listener (void) { this->statelisten_data_listener_created_ = true; diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.cpp index 389170240fe..d478695b319 100644 --- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.cpp @@ -40,15 +40,15 @@ namespace CIAO_State_Connection_Test_Sender_Impl void Sender_exec_i::configuration_complete (void) { - this->updater_ = + ::State_Connection_Test::State_ConnectionTestConnector::Updater_var updater = this->context_->get_connection_info_update_data (); - if (! ::CORBA::is_nil (this->updater_)) + if (! ::CORBA::is_nil (updater.in ())) { this->updater_ok_ = true; } - this->updater_dds_datawriter_ = + ::DDS::DataWriter_var updater_dds_datawriter = this->context_->get_connection_info_update_dds_entity (); - if (! ::CORBA::is_nil (this->updater_dds_datawriter_)) + if (! ::CORBA::is_nil (updater_dds_datawriter.in ())) { this->updater_dds_datawriter_ok_ = true; } diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.h index 754a61b6420..e4d0a46e6eb 100644 --- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.h @@ -34,10 +34,6 @@ namespace CIAO_State_Connection_Test_Sender_Impl private: ::State_Connection_Test::CCM_Sender_Context_var context_; - ::State_Connection_Test - ::State_ConnectionTestConnector - ::Updater_var updater_; - ::DDS::DataWriter_var updater_dds_datawriter_; bool updater_ok_; bool updater_dds_datawriter_ok_; -- cgit v1.2.1