Tue Jun 15 06:44:53 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * 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

2 files changed, 4 insertions, 6 deletions

diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp
index 1fb938bcf5e..3e8ef708329 100644
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp
@@ -33,15 +33,15 @@ namespace CIAO_Event_Connection_Test_Sender_Impl
   void
   Sender_exec_i::configuration_complete (void)
   {
-    this->writer_ =
+    ::Event_ConnectionConnector::Writer_var writer =
         this->context_->get_connection_info_write_data ();
-    if (! ::CORBA::is_nil (this->writer_))
+    if (! ::CORBA::is_nil (writer_.in ()))
       {
         this->writer_ok_ = true;
       }
-    this->writer_dds_datawriter_ =
+    DDS::DataWriter_var writer_dds_datawriter =
         this->context_->get_connection_info_write_dds_entity ();
-    if (! ::CORBA::is_nil (this->writer_dds_datawriter_))
+    if (! ::CORBA::is_nil (this->writer_dds_datawriter_.in ()))
       {
         this->writer_dds_datawriter_ok_ = true;
       }
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.h
index ac03664f52d..704d4d9c35b 100644
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.h
@@ -38,8 +38,6 @@ namespace CIAO_Event_Connection_Test_Sender_Impl
 
   private:
     ::Event_Connection_Test::CCM_Sender_Context_var context_;
-    ::Event_ConnectionConnector::Writer_var writer_;
-    DDS::DataWriter_var writer_dds_datawriter_;
 
     bool writer_ok_;
     bool writer_dds_datawriter_ok_;