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

19 files changed, 50 insertions, 78 deletions

diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.cpp
index c7d0c79c3d3..a3b8d331a63 100644
--- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.cpp
@@ -37,13 +37,13 @@ namespace CIAO_DNM_Test_Sender_Nested_Sender_Sender_Impl
   void
   Sender_exec_i::ccm_activate (void)
   {
-    this->writer_ = this->context_->get_connection_info_write_data ();
+    ::DNM_Test_Connector::Nested_Connector::DNM_TestConnector::Writer_var writer =
+      this->context_->get_connection_info_write_data ();
 
-    ::X::Y::Z::DNM_Test_Struct * dnm =
-        new ::X::Y::Z::DNM_Test_Struct;
-    dnm->key = CORBA::string_dup ("KEY_1");
-    dnm->iter = 10;
-    this->writer_->write_one (*dnm, ::DDS::HANDLE_NIL);
+    ::X::Y::Z::DNM_Test_Struct dnm;
+    dnm.key = CORBA::string_dup ("KEY_1");
+    dnm.iter = 10;
+    writer->write_one (dnm, ::DDS::HANDLE_NIL);
   }
 
   void
diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.h
index 1137811c743..087202207ce 100644
--- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.h
@@ -38,7 +38,6 @@ namespace CIAO_DNM_Test_Sender_Nested_Sender_Sender_Impl
 
   private:
     ::DNM_Test_Sender::Nested_Sender::CCM_Sender_Context_var context_;
-    ::DNM_Test_Connector::Nested_Connector::DNM_TestConnector::Writer_var writer_;
   };
 
   extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
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_;
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component_exec.cpp
index de3104f1801..639458ec58e 100644
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component_exec.cpp
@@ -90,8 +90,8 @@ namespace CIAO_GCS_Test_GetComponentStateTestComponent_Impl
     //DDS_Update -> Writer
     try
       {
-        ::GCSTestConnector::Updater_var updater_data;
-        updater_data = this->context_->get_connection_info_update_data ();
+        ::GCSTestConnector::Updater_var updater_data =
+          this->context_->get_connection_info_update_data ();
         if (! ::CORBA::is_nil (updater_data.in ()))
           {
             CORBA::Object_var cmp = updater_data->_get_component ();
@@ -135,8 +135,8 @@ namespace CIAO_GCS_Test_GetComponentStateTestComponent_Impl
     //DDS_Read -> Reader
     try
       {
-        ::GCSTestConnector::Reader_var reader_data;
-        reader_data = this->context_->get_connection_info_read_data ();
+        ::GCSTestConnector::Reader_var reader_data =
+          this->context_->get_connection_info_read_data ();
         if (! ::CORBA::is_nil (reader_data.in ()))
           {
             CORBA::Object_var cmp = reader_data->_get_component ();
@@ -180,8 +180,8 @@ namespace CIAO_GCS_Test_GetComponentStateTestComponent_Impl
     //Reader on DDS_Get
     try
       {
-        ::GCSTestConnector::Reader_var getter_data;
-        getter_data = this->context_->get_connection_info_get_data ();
+        ::GCSTestConnector::Reader_var getter_data =
+          this->context_->get_connection_info_get_data ();
         if (! ::CORBA::is_nil (getter_data.in ()))
           {
             CORBA::Object_var cmp = getter_data->_get_component ();
@@ -221,8 +221,8 @@ namespace CIAO_GCS_Test_GetComponentStateTestComponent_Impl
     //Getter on DDS_Get
     try
       {
-        ::GCSTestConnector::Getter_var getter_fresh_data;
-        getter_fresh_data = this->context_->get_connection_info_get_fresh_data ();
+        ::GCSTestConnector::Getter_var getter_fresh_data =
+          this->context_->get_connection_info_get_fresh_data ();
         if (! ::CORBA::is_nil (getter_fresh_data.in ()))
           {
             CORBA::Object_var cmp = getter_fresh_data->_get_component ();
@@ -266,8 +266,8 @@ namespace CIAO_GCS_Test_GetComponentStateTestComponent_Impl
     try
       {
         //DDS_Listen
-        ::GCSTestConnector::Reader_var listen_data;
-        listen_data = this->context_->get_connection_info_listen_data ();
+        ::GCSTestConnector::Reader_var listen_data =
+          this->context_->get_connection_info_listen_data ();
         if (! ::CORBA::is_nil (listen_data.in ()))
           {
             CORBA::Object_var cmp = listen_data->_get_component ();
@@ -306,8 +306,7 @@ namespace CIAO_GCS_Test_GetComponentStateTestComponent_Impl
 
     try
       {
-        ::CCM_DDS::DataListenerControl_var  listen_data_control;
-        listen_data_control =
+        ::CCM_DDS::DataListenerControl_var  listen_data_control =
           this->context_->get_connection_info_listen_data_control ();
         if (! ::CORBA::is_nil (listen_data_control.in ()))
           {
@@ -352,8 +351,7 @@ namespace CIAO_GCS_Test_GetComponentStateTestComponent_Impl
     //DDS_StateListen
     try
       {
-        ::GCSTestConnector::Reader_var statelisten_data;
-        statelisten_data =
+        ::GCSTestConnector::Reader_var statelisten_data =
           this->context_->get_connection_info_statelisten_data ();
         if (! ::CORBA::is_nil (statelisten_data.in ()))
           {
@@ -393,8 +391,7 @@ namespace CIAO_GCS_Test_GetComponentStateTestComponent_Impl
 
     try
       {
-        ::CCM_DDS::StateListenerControl_var statelisten_data_control;
-        statelisten_data_control =
+        ::CCM_DDS::StateListenerControl_var statelisten_data_control =
           this->context_->get_connection_info_statelisten_data_control ();
         if (! ::CORBA::is_nil (statelisten_data_control.in ()))
           {
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp
index 091f299e2af..bb0715ee597 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp
@@ -62,7 +62,7 @@ namespace CIAO_Writer_Sender_Impl
       {
         try
           {
-            ::DDS::InstanceHandle_t hnd = this->handles_[i->first.c_str ()];
+            ::DDS::InstanceHandle_t const hnd = this->handles_[i->first.c_str ()];
             this->writer_->unregister_instance (i->second, hnd);
             ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Unregistered <%C> - iteration <%d> - valid handle <%d>\n"),
                       i->first.c_str (),
@@ -182,7 +182,7 @@ namespace CIAO_Writer_Sender_Impl
 
     WriterTestSeq write_many_seq;
     write_many_seq.length (this->keys_ * this->iterations_);
-    int iter_key = 0;
+    ::CORBA::ULong iter_key = 0;
     for (Writer_Table::iterator iter = this->ktests_.begin ();
          iter != this->ktests_.end ();
          ++iter)
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp
index 882d48f8649..440bd3585c0 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp
@@ -167,7 +167,7 @@ namespace CIAO_LMBM_Test_Receiver_Impl
   void
   Receiver_exec_i::ccm_remove (void)
   {
-    CORBA::ULong expected = this->keys_ * this->iterations_;
+    CORBA::ULong const expected = this->keys_ * this->iterations_;
     if (this->received_many_by_many_.value () == 0)
       {
         ACE_ERROR ((LM_ERROR, "ERROR: MANY_BY_MANY: "
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.cpp
index a899d79fe22..4063b54dd55 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.cpp
@@ -99,8 +99,7 @@ namespace CIAO_OIT_Test_Receiver_Impl
   Receiver_exec_i::set_session_context (
     ::Components::SessionContext_ptr ctx)
   {
-    this->context_ =
-      ::OIT_Test::CCM_Receiver_Context::_narrow (ctx);
+    this->context_ = ::OIT_Test::CCM_Receiver_Context::_narrow (ctx);
     if ( ::CORBA::is_nil (this->context_.in ()))
       {
         throw ::CORBA::INTERNAL ();
@@ -128,14 +127,12 @@ namespace CIAO_OIT_Test_Receiver_Impl
     if (!this->inconsistent_.value ())
       {
         ACE_ERROR ((LM_ERROR, ACE_TEXT ("RECEIVER ERROR: did not receive the expected ")
-                              ACE_TEXT ("error 'on_inconsistent_topic'\n")
-                    ));
+                              ACE_TEXT ("error 'on_inconsistent_topic'\n")));
       }
     else
       {
         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RECEIVER OK: Received the expected ")
-                              ACE_TEXT ("'on_inconsistent_topic'\n")
-                    ));
+                              ACE_TEXT ("'on_inconsistent_topic'\n")));
       }
     if (this->thread_id_listener_.value () == 0)
       {
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.cpp
index bd4cecda90f..a571ba39418 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.cpp
@@ -85,8 +85,7 @@ namespace CIAO_OIT_Test_Sender_Impl
   void
   Sender_exec_i::set_session_context (::Components::SessionContext_ptr ctx)
   {
-    this->context_ =
-      ::OIT_Test::CCM_Sender_Context::_narrow (ctx);
+    this->context_ = ::OIT_Test::CCM_Sender_Context::_narrow (ctx);
 
     if ( ::CORBA::is_nil (this->context_.in ()))
       {
@@ -115,14 +114,12 @@ namespace CIAO_OIT_Test_Sender_Impl
     if (this->inconsistent_.value ())
       {
         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SENDER OK: Received the expected ")
-                              ACE_TEXT ("'on_inconsistent_topic'\n")
-                    ));
+                              ACE_TEXT ("'on_inconsistent_topic'\n")));
       }
     else
       {
         ACE_ERROR ((LM_ERROR, ACE_TEXT ("SENDER ERROR: did not receive the expected ")
-                              ACE_TEXT ("error 'on_inconsistent_topic'\n")
-                    ));
+                              ACE_TEXT ("error 'on_inconsistent_topic'\n")));
       }
     if (this->thread_id_listener_.value () == 0)
       {
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.cpp
index 2af7ab87ede..8d0abf3643e 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.cpp
@@ -94,7 +94,7 @@ namespace CIAO_QCLE_Test_Sender_Impl
     for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i)
       {
         char key[7];
-        QueryConditionListenEventTest *new_key = new QueryConditionListenEventTest;
+        QueryConditionListenEventTest* new_key = new QueryConditionListenEventTest;
         ACE_OS::sprintf (key, "KEY_%d", i);
         new_key->key = CORBA::string_dup(key);
         new_key->iteration = 0;
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp
index 2973d88bc37..5b09b3e32d5 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp
@@ -81,15 +81,15 @@ namespace CIAO_ReadGet_Test_Sender_Impl
         for (CORBA::UShort iter_key = 1; iter_key < this->keys_ + 1; ++iter_key)
           {
             char key[7];
-            QueryConditionTest *new_key = new QueryConditionTest;
+            QueryConditionTest new_key;
             ACE_OS::sprintf (key, "KEY_%d", iter_key);
-            new_key->symbol = CORBA::string_dup(key);
+            new_key.symbol = CORBA::string_dup(key);
             for (CORBA::UShort iter = ((this->run_ - 2) * this->iterations_) + 1;
                 iter < this->run_ * this->iterations_ + 1;
                 ++iter)
               {
-                new_key->iteration = iter;
-                this->writer_->write_one (*new_key, ::DDS::HANDLE_NIL);
+                new_key.iteration = iter;
+                this->writer_->write_one (new_key, ::DDS::HANDLE_NIL);
                 ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Written key <%C> with <%d>\n"),
                             key, iter));
               }
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.h
index 5527e7ed789..ab7e4e2e82d 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.h
@@ -64,8 +64,7 @@ namespace CIAO_ReadGet_Test_Sender_Impl
 
     virtual void keys (::CORBA::UShort keys);
 
-    virtual ::CCM_ReadGetRestarter_ptr
-    get_restart_writer (void);
+    virtual ::CCM_ReadGetRestarter_ptr get_restart_writer (void);
 
     virtual void set_session_context (::Components::SessionContext_ptr ctx);
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.cpp
index 9414891d3d5..7f54311f426 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.cpp
@@ -86,8 +86,7 @@ namespace CIAO_QCLS_Test_Sender_Impl
   void
   Sender_exec_i::run ()
   {
-
-    //first create the instances for consecutive updating.
+    // First create the instances for consecutive updating.
     for (CORBA::UShort i = 1; i < this->keys () + 1; ++i)
       {
         char key[7];
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.h
index f194200145d..0c4c0be6393 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.h
@@ -15,8 +15,6 @@
 
 #include "tao/LocalObject.h"
 
-
-
 namespace CIAO_QCLS_Test_Sender_Impl
 {
   class Sender_exec_i;
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.cpp
index d5e36316a2b..ddc47c797ab 100644
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.cpp
@@ -66,7 +66,7 @@ namespace CIAO_SetConnectorAttribute_SetConnectorAttributeComponent_Impl
   void
   Component_exec_i::check_attributes (DDSDataWriter * dw)
   {
-    //check topic name
+    // Check topic name
     DDSTopic * tp = dw->get_topic ();
     if (!tp)
       {
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.h b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.h
index 18edf4ce13f..bfcae42fae4 100644
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.h
@@ -43,17 +43,13 @@ namespace CIAO_SetConnectorAttribute_SetConnectorAttributeComponent_Impl
   private:
     ::SetConnectorAttribute::CCM_SetConnectorAttributeComponent_Context_var context_;
 
-    void
-    check_attributes (DDSDataWriter * dw);
+    void check_attributes (DDSDataWriter * dw);
 
-    void
-    check_profile (DDSPublisher * pub);
+    void check_profile (DDSPublisher * pub);
 
-    void
-    check_topic_name (DDSTopic * tp);
+    void check_topic_name (DDSTopic * tp);
 
-    void
-    check_domain_id (DDSPublisher * pub);
+    void check_domain_id (DDSPublisher * pub);
 
   };
 
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_;