Thu Jun 17 07:43:08 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h:
        * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h:
        * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.h:
        * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.h:
        * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h:
        * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h:
        * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h:
        * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h:
        * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.h:
        * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h:
        * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.h:
        * connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h:
        * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h:
        * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h:
        * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h:
        * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp:
          Cleanup, no caching in executors

34 files changed, 258 insertions, 170 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index b3c33f6e9db..eb956820048 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,7 +1,44 @@
+Thu Jun 17 07:43:08 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h:
+        * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h:
+        * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.h:
+        * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.h:
+        * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h:
+        * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h:
+        * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h:
+        * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h:
+        * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.h:
+        * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h:
+        * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.h:
+        * connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h:
+        * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h:
+        * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h:
+        * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h:
+        * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp:
+          Cleanup, no caching in executors
+
 Thu Jun 17 04:21:51 UTC 2010  James H. Hill  <hillj at cs dot iupui dot edu>
 
         * connectors/dds4ccm/examples/Shapes/models/Shapes-complete.xme:
-        
+
           Complete model for the Shapes example.
 
 Wed Jun 16 19:13:32 UTC 2010  Marcel Smit  <msmit@remedy.nl>
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp
index 7853510b1b8..a55f27ed648 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp
@@ -156,13 +156,19 @@ namespace CIAO_CSL_SRTest_Receiver_Impl
   void
   Receiver_exec_i::read_all (void)
   {
-    if (::CORBA::is_nil (this->reader_.in ()))
+    ::CSL_SR_Connector::Reader_var reader;
+    if (this->read_data ())
+      {
+       reader = this->context_->get_connection_info_out_data();
+      }
+
+    if (::CORBA::is_nil (reader.in ()))
       {
         return;
       }
     TestTopicSeq TestTopic_infos;
     ::CCM_DDS::ReadInfoSeq readinfoseq;
-    this->reader_->read_all(TestTopic_infos, readinfoseq);
+    reader->read_all(TestTopic_infos, readinfoseq);
     for(CORBA::ULong i = 0; i < readinfoseq.length(); ++i)
       {
         ACE_Time_Value tv;
@@ -255,10 +261,6 @@ namespace CIAO_CSL_SRTest_Receiver_Impl
   void
   Receiver_exec_i::configuration_complete (void)
   {
-    if (this->read_data ())
-      {
-       this->reader_ = this->context_->get_connection_info_out_data();
-      }
   }
 
   void
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h
index bcc0767fd42..61a31374a16 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h
@@ -152,7 +152,6 @@ namespace CIAO_CSL_SRTest_Receiver_Impl
 
   private:
     ::CSL_SRTest::CCM_Receiver_Context_var context_;
-    ::CSL_SR_Connector::Reader_var reader_;
 
     read_action_Generator * ticker_;
     CORBA::ULong rate_;
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp
index 3946ab0e88f..eb60c0b7c9f 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp
@@ -221,19 +221,21 @@ namespace CIAO_CSL_USTest_Receiver_Impl
   void
   Receiver_exec_i::configuration_complete (void)
   {
-    this->reader_ = this->context_->get_connection_info_read_data ();
   }
 
   void
   Receiver_exec_i::read_all ()
   {
+    ::CSL_US_Connector::Reader_var reader =
+      this->context_->get_connection_info_read_data ();
+
     try
       {
         TestTopicSeq readertest_info_seq;
         ::CCM_DDS::ReadInfoSeq readinfo_seq;
         if (this->received_ < 30)
           {
-            this->reader_->read_all (readertest_info_seq, readinfo_seq);
+            reader->read_all (readertest_info_seq, readinfo_seq);
             ACE_DEBUG ((LM_DEBUG, "Read %u samples\n",
                                   readinfo_seq.length ()));
             this->received_ += readinfo_seq.length ();
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h
index 914d01a2ada..3de6c768175 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h
@@ -149,7 +149,6 @@ namespace CIAO_CSL_USTest_Receiver_Impl
   private:
     ::CSL_USTest::CCM_Receiver_Context_var context_;
     ::CCM_DDS::DataListenerControl_var lc_;
-    ::CSL_US_Connector::Reader_var reader_;
 
     Pulser *pulser_;
 
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp
index cd8de13e9d3..607d379a50f 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp
@@ -141,8 +141,9 @@ namespace CIAO_CFTLE_Test_Receiver_Impl
   void
   Receiver_exec_i::configuration_complete (void)
   {
-    this->reader_ = this->context_->get_connection_info_listen_data ();
-    if (CORBA::is_nil (this->reader_))
+    ::CFTLE_Test::ContentFilteredTopicListenEventTestConnector::Reader_var reader =
+      this->context_->get_connection_info_listen_data ();
+    if (CORBA::is_nil (reader.in ()))
       {
         ACE_ERROR ((LM_ERROR, "Receiver_exec_i::configuration_complete - "
                               "Error get reader connection.\n"));
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.h
index 542170a2b56..57d288ba5af 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.h
@@ -88,7 +88,6 @@ namespace CIAO_CFTLE_Test_Receiver_Impl
 
   private:
     ::CFTLE_Test::CCM_Receiver_Context_var context_;
-    ::CFTLE_Test::ContentFilteredTopicListenEventTestConnector::Reader_var reader_;
 
     Atomic_ThreadId thread_id_listener_;
 
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp
index 3c7e5279659..ef997c1e2cb 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp
@@ -108,7 +108,7 @@ namespace CIAO_ReadGet_Test_Receiver_Impl
           }
         QueryConditionTest queryfiltertest_info;
         ::CCM_DDS::ReadInfo readinfo;
-        char key[100];
+        char key[10];
         ACE_OS::sprintf (key, "KEY_%d", this->keys_);
         queryfiltertest_info.symbol = CORBA::string_dup (key);
         get_reader->read_one_last (
@@ -248,9 +248,9 @@ namespace CIAO_ReadGet_Test_Receiver_Impl
     to.nanosec = 0;
     get_getter->time_out (to);
 
-    QueryConditionTest * qf_info = new QueryConditionTest;
+    QueryConditionTest_var qf_info;;
     ::CCM_DDS::ReadInfo readinfo;
-    bool result = get_getter->get_one (qf_info, readinfo);
+    CORBA::Boolean result = get_getter->get_one (qf_info.out (), readinfo);
     if (result)
       {
         this->check_iter_on_getter_port (*qf_info, "GET");
@@ -263,7 +263,7 @@ namespace CIAO_ReadGet_Test_Receiver_Impl
       }
     while (result)
       {
-        result = get_getter->get_one (qf_info, readinfo);
+        result = get_getter->get_one (qf_info.out (), readinfo);
         if (result)
           {
             this->check_iter_on_getter_port (*qf_info, "GET");
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.cpp
index 51f8505268b..75ce05fd8e4 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.cpp
@@ -150,8 +150,9 @@ namespace CIAO_CFTLS_Test_Receiver_Impl
   void
   Receiver_exec_i::configuration_complete (void)
   {
-    this->reader_ = this->context_->get_connection_info_state_data ();
-    if (CORBA::is_nil (this->reader_.in ()))
+    ::CFTLS_Test::ContentFilteredTopicListenStateTestConnector::Reader_var reader =
+      this->context_->get_connection_info_state_data ();
+    if (CORBA::is_nil (reader.in ()))
       {
         ACE_ERROR ((LM_ERROR, "Receiver_exec_i::configuration_complete - "
                               "Error get reader connection.\n"));
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.h
index d2c70eb5927..33730ede4fc 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.h
@@ -94,7 +94,6 @@ namespace CIAO_CFTLS_Test_Receiver_Impl
 
   private:
     ::CFTLS_Test::CCM_Receiver_Context_var context_;
-    ::CFTLS_Test::ContentFilteredTopicListenStateTestConnector::Reader_var reader_;
 
     Atomic_ThreadId thread_id_listener_;
 
diff --git a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.cpp
index 7f3f04042c8..6a1c408cddf 100644
--- a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.cpp
@@ -66,7 +66,7 @@ namespace CIAO_Writer_Receiver_Impl
   ::CCM_DDS::CCM_PortStatusListener_ptr
   Receiver_exec_i::get_info_out_status (void)
   {
-    return 0;
+    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
   }
 
   void
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp
index 222ed2fdd3b..2d2b448846b 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp
@@ -112,10 +112,10 @@ namespace CIAO_Getter_Test_Receiver_Impl
                                   CORBA::Long fixed_key,
                                   CORBA::Long iteration)
   {
-    GetOneHandler* rh = new  GetOneHandler (*this,
-                                            CORBA::string_dup (key),
-                                            fixed_key,
-                                            iteration);
+    GetOneHandler* rh = new GetOneHandler (*this,
+                                           CORBA::string_dup (key),
+                                           fixed_key,
+                                           iteration);
     this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->notify (rh);
   }
 
@@ -140,22 +140,25 @@ namespace CIAO_Getter_Test_Receiver_Impl
     // pass when at least one sample is returned.
     // Also, max_delivered_data cannot be tested since only
     // one sample is returned.
+    ::Getter_Test::GetterTestConnector::Getter_var getter =
+      this->context_->get_connection_info_get_fresh_data ();
+
     DDS::Duration_t to;
     to.sec = 10;
     to.nanosec = 0;
-    this->getter_->time_out (to);
-    this->getter_->max_delivered_data (40);
+    getter->time_out (to);
+    getter->max_delivered_data (40);
     ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::get_many: "
                           "Start getting data from DDS: "
                           "#keys <%d> - #iterations <%d> with timeout: "
                           "sec <%d> - nanosec <%u>\n",
                           keys, iterations,
-                          this->getter_->time_out ().sec,
-                          this->getter_->time_out ().nanosec));
+                          getter->time_out ().sec,
+                          getter->time_out ().nanosec));
 
     GetterTestSeq gettertest_seq;
     ::CCM_DDS::ReadInfoSeq readinfo;
-    bool const result = this->getter_->get_many (gettertest_seq, readinfo);
+    bool const result = getter->get_many (gettertest_seq, readinfo);
     if (result)
       {
         if (gettertest_seq.length () == 0)
@@ -183,22 +186,25 @@ namespace CIAO_Getter_Test_Receiver_Impl
   void
   Receiver_exec_i::get_one_fixed (CORBA::Long fixed_key, CORBA::Long iteration)
   {
+    ::Getter_Test::GetterFixedConnector::Getter_var fixed =
+      this->context_->get_connection_info_fixed_fresh_data ();
+
     DDS::Duration_t to;
     to.sec = 5;
     to.nanosec = 0;
-    this->fixed_->time_out (to);
+    fixed->time_out (to);
     ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::get_one_fixed: "
                           "Start getting data from DDS: "
                           "key <%u> - iteration <%d> "
                           " with timeout: "
                           "sec <%u> - nanosec <%u>\n",
                           fixed_key, iteration,
-                          this->getter_->time_out ().sec,
-                          this->getter_->time_out ().nanosec));
+                          fixed->time_out ().sec,
+                          fixed->time_out ().nanosec));
     GetterFixed gettertest_info;
     ::CCM_DDS::ReadInfo readinfo;
     ACE_Time_Value tv = ACE_OS::gettimeofday ();
-    bool result = this->fixed_->get_one (gettertest_info, readinfo);
+    CORBA::Boolean const result = fixed->get_one (gettertest_info, readinfo);
     if (result)
       {
         ACE_Time_Value dur = ACE_OS::gettimeofday () - tv;
@@ -260,22 +266,25 @@ namespace CIAO_Getter_Test_Receiver_Impl
   void
   Receiver_exec_i::get_one_variable (const char * key, CORBA::Long iteration)
   {
+    ::Getter_Test::GetterTestConnector::Getter_var getter =
+      this->context_->get_connection_info_get_fresh_data ();
+
     DDS::Duration_t to;
     to.sec = 5;
     to.nanosec = 0;
-    this->getter_->time_out (to);
+    getter->time_out (to);
     ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::get_one_variable: "
                           "Start getting data from DDS: "
                           "key <%C> - iteration <%d> "
                           " with timeout: "
                           "sec <%d> - nanosec <%u>\n",
                           key, iteration,
-                          this->getter_->time_out ().sec,
-                          this->getter_->time_out ().nanosec));
-    GetterTest *gettertest_info = new GetterTest;
+                          getter->time_out ().sec,
+                          getter->time_out ().nanosec));
+    GetterTest_var gettertest_info;
     ::CCM_DDS::ReadInfo readinfo;
     ACE_Time_Value tv = ACE_OS::gettimeofday ();
-    bool result = this->getter_->get_one (gettertest_info, readinfo);
+    CORBA::Boolean const result = getter->get_one (gettertest_info.out (), readinfo);
     if (result)
       {
         ACE_Time_Value dur = ACE_OS::gettimeofday () - tv;
@@ -348,18 +357,21 @@ namespace CIAO_Getter_Test_Receiver_Impl
   {
     try
       {
+        ::Getter_Test::GetterFixedConnector::Getter_var fixed =
+          this->context_->get_connection_info_fixed_fresh_data ();
+
         DDS::Duration_t to;
         to.sec = 1;
         to.nanosec = 0;
-        this->fixed_->time_out (to);
+        fixed->time_out (to);
         ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::timeout_get_one_fixed: "
                               "Start getting data from DDS: timeout: "
                               "sec <%d> - nanosec <%u>\n",
-                              this->fixed_->time_out ().sec,
-                              this->fixed_->time_out ().nanosec));
+                              fixed->time_out ().sec,
+                              fixed->time_out ().nanosec));
         GetterFixed gettertest_info;
         ::CCM_DDS::ReadInfo readinfo;
-        bool result = this->fixed_->get_one (gettertest_info, readinfo);
+        CORBA::Boolean const result = fixed->get_one (gettertest_info, readinfo);
         if (result)
           {
             ACE_ERROR ((LM_ERROR, "ERROR FIXED: TIMEOUT GET ONE: "
@@ -390,18 +402,21 @@ namespace CIAO_Getter_Test_Receiver_Impl
   {
     try
       {
+        ::Getter_Test::GetterTestConnector::Getter_var getter =
+          this->context_->get_connection_info_get_fresh_data ();
+
         DDS::Duration_t to;
         to.sec = 1;
         to.nanosec = 0;
-        this->getter_->time_out (to);
+        getter->time_out (to);
         ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::timeout_get_one_variable: "
                               "Start getting data from DDS: timeout: "
                               "sec <%d> - nanosec <%u>\n",
-                              this->getter_->time_out ().sec,
-                              this->getter_->time_out ().nanosec));
-        GetterTest *gettertest_info = new GetterTest;
+                              getter->time_out ().sec,
+                              getter->time_out ().nanosec));
+        GetterTest_var gettertest_info;;
         ::CCM_DDS::ReadInfo readinfo;
-        bool result = this->getter_->get_one (gettertest_info, readinfo);
+        CORBA::Boolean result = getter->get_one (gettertest_info.out (), readinfo);
         if (result)
           {
             ACE_ERROR ((LM_ERROR, "ERROR VARIABLE: TIMEOUT GET ONE: "
@@ -439,18 +454,21 @@ namespace CIAO_Getter_Test_Receiver_Impl
   {
     try
       {
+        ::Getter_Test::GetterTestConnector::Getter_var getter =
+          this->context_->get_connection_info_get_fresh_data ();
+
         DDS::Duration_t to;
         to.sec = 1;
         to.nanosec = 0;
-        this->getter_->time_out (to);
+        getter->time_out (to);
         ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::timeout_get_many: "
                               "Start getting data from DDS: timeout: "
                               "sec <%d> - nanosec <%u>\n",
-                              this->getter_->time_out ().sec,
-                              this->getter_->time_out ().nanosec));
+                              getter->time_out ().sec,
+                              getter->time_out ().nanosec));
         GetterTestSeq gettertest_seq;
         ::CCM_DDS::ReadInfoSeq readinfo;
-        bool const result = this->getter_->get_many (gettertest_seq, readinfo);
+        CORBA::Boolean const result = getter->get_many (gettertest_seq, readinfo);
         if (result)
           {
             ACE_ERROR ((LM_ERROR, "ERROR: TIMEOUT GET MANY: "
@@ -515,8 +533,6 @@ namespace CIAO_Getter_Test_Receiver_Impl
   void
   Receiver_exec_i::configuration_complete (void)
   {
-    this->getter_ = this->context_->get_connection_info_get_fresh_data ();
-    this->fixed_ = this->context_->get_connection_info_fixed_fresh_data ();
   }
 
   void
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h
index 1f020f9a85a..3cd079df2e7 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h
@@ -97,15 +97,11 @@ namespace CIAO_Getter_Test_Receiver_Impl
     virtual ::Getter_Test::GetterTestConnector::CCM_Listener_ptr
     get_info_out_data_listener (void);
 
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_get_status (void);
+    virtual ::CCM_DDS::CCM_PortStatusListener_ptr get_info_get_status (void);
 
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_fixed_status (void);
-
-    virtual ::CCM_GetInvoker_ptr
-    get_getter_invoke ();
+    virtual ::CCM_DDS::CCM_PortStatusListener_ptr get_info_fixed_status (void);
 
+    virtual ::CCM_GetInvoker_ptr get_getter_invoke ();
 
     void start_get_one (const char * key,
                         CORBA::Long fixed_key,
@@ -116,11 +112,9 @@ namespace CIAO_Getter_Test_Receiver_Impl
                   CORBA::Long fixed_key,
                   CORBA::Long iteration);
 
-    void start_get_many (CORBA::Short keys,
-                         CORBA::Long iterations);
+    void start_get_many (CORBA::Short keys, CORBA::Long iterations);
 
-    void get_many (CORBA::Short keys,
-                         CORBA::Long iterations);
+    void get_many (CORBA::Short keys, CORBA::Long iterations);
 
     virtual void
     set_session_context (
@@ -134,16 +128,12 @@ namespace CIAO_Getter_Test_Receiver_Impl
 
   private:
     ::Getter_Test::CCM_Receiver_Context_var context_;
-    ::Getter_Test::GetterTestConnector::Getter_var getter_;
-    ::Getter_Test::GetterFixedConnector::Getter_var fixed_;
 
     void timeout_get_one_fixed ();
     void timeout_get_one_variable ();
 
-    void get_one_fixed (CORBA::Long fixed_key,
-                        CORBA::Long iteration);
-    void get_one_variable (const char * key,
-                           CORBA::Long iteration);
+    void get_one_fixed (CORBA::Long fixed_key, CORBA::Long iteration);
+    void get_one_variable (const char * key, CORBA::Long iteration);
   };
 
   extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp
index d3b5c9da0d5..4eac207c278 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp
@@ -65,7 +65,10 @@ namespace CIAO_Keyed_Test_Receiver_Impl
   void
   Receiver_exec_i::read (void)
   {
-    if (::CORBA::is_nil (this->reader_.in ()))
+    ::KeyedTestConnector::Reader_var reader =
+      this->context_->get_connection_info_out_data();
+
+    if (::CORBA::is_nil (reader.in ()))
       {
         return;
       }
@@ -74,11 +77,11 @@ namespace CIAO_Keyed_Test_Receiver_Impl
         for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i)
           {
             KeyedTest keyedtest_info;
-            char key[100];
+            char key[10];
             ACE_OS::sprintf (key, "KEY_%d", i);
             keyedtest_info.key = CORBA::string_dup (key);
             ::CCM_DDS::ReadInfo readinfo;
-            this->reader_->read_one_last (keyedtest_info, readinfo, ::DDS::HANDLE_NIL);
+            reader->read_one_last (keyedtest_info, readinfo, ::DDS::HANDLE_NIL);
 
             ACE_Time_Value tv;
             tv <<= readinfo.source_timestamp;
@@ -113,8 +116,7 @@ namespace CIAO_Keyed_Test_Receiver_Impl
   }
 
   void
-  Receiver_exec_i::rate (
-    ::CORBA::ULong rate)
+  Receiver_exec_i::rate (::CORBA::ULong rate)
   {
     this->rate_ = rate;
   }
@@ -148,13 +150,13 @@ namespace CIAO_Keyed_Test_Receiver_Impl
   ::KeyedTestConnector::CCM_Listener_ptr
   Receiver_exec_i::get_info_out_data_listener (void)
   {
-    return 0;
+    return ::KeyedTestConnector::CCM_Listener::_nil ();
   }
 
   ::CCM_DDS::CCM_PortStatusListener_ptr
   Receiver_exec_i::get_info_out_status (void)
   {
-    return 0;
+    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
   }
 
   void
@@ -172,7 +174,6 @@ namespace CIAO_Keyed_Test_Receiver_Impl
   void
   Receiver_exec_i::configuration_complete (void)
   {
-    this->reader_ = this->context_->get_connection_info_out_data();
   }
 
   void
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h
index c71d27af9c5..3f52792a864 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h
@@ -82,7 +82,6 @@ namespace CIAO_Keyed_Test_Receiver_Impl
 
   private:
     ::Keyed_Test::CCM_Receiver_Context_var context_;
-    ::KeyedTestConnector::Reader_var reader_;
 
     read_action_Generator * ticker_;
     CORBA::ULong rate_;
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp
index ef65bf8213e..60369c1271b 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp
@@ -138,7 +138,9 @@ namespace CIAO_PSL_DeadlineTest_Receiver_Impl
   void
   Receiver_exec_i::read_all (void)
   {
-    if (::CORBA::is_nil (this->reader_.in ()))
+    ::PSL_DeadlineTest::PSLDeadlineConnector::Reader_var reader =
+      this->context_->get_connection_info_out_data();
+    if (::CORBA::is_nil (reader.in ()))
       {
         return;
       }
@@ -146,7 +148,7 @@ namespace CIAO_PSL_DeadlineTest_Receiver_Impl
     ::CCM_DDS::ReadInfoSeq readinfoseq;
     try
       {
-        this->reader_->read_all(TestTopic_infos, readinfoseq);
+        reader->read_all(TestTopic_infos, readinfoseq);
         for(CORBA::ULong i = 0; i < readinfoseq.length(); ++i)
           {
             ACE_Time_Value tv;
@@ -213,7 +215,6 @@ namespace CIAO_PSL_DeadlineTest_Receiver_Impl
   void
   Receiver_exec_i::configuration_complete (void)
   {
-    this->reader_ = this->context_->get_connection_info_out_data();
   }
 
   void
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h
index e9c93f9cf89..fba554a98c3 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h
@@ -113,16 +113,12 @@ namespace CIAO_PSL_DeadlineTest_Receiver_Impl
     virtual ::PSL_DeadlineTest::PSLDeadlineConnector::CCM_Listener_ptr
     get_info_out_data_listener (void);
 
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_status (void);
+    virtual ::CCM_DDS::CCM_PortStatusListener_ptr get_info_out_status (void);
 
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_get_status (void);
+    virtual ::CCM_DDS::CCM_PortStatusListener_ptr get_info_get_status (void);
 
     // Operations from Components::SessionComponent.
-    virtual void
-    set_session_context (
-      ::Components::SessionContext_ptr ctx);
+    virtual void set_session_context (::Components::SessionContext_ptr ctx);
 
     virtual void configuration_complete (void);
     virtual void ccm_activate (void);
@@ -132,7 +128,6 @@ namespace CIAO_PSL_DeadlineTest_Receiver_Impl
 
   private:
     ::PSL_DeadlineTest::CCM_Receiver_Context_var context_;
-    ::PSL_DeadlineTest::PSLDeadlineConnector::Reader_var reader_;
     read_action_Generator * ticker_;
     CORBA::ULong rate_;
 
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 6208e950127..2f6aa70e130 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
@@ -148,7 +148,10 @@ namespace CIAO_PSL_SampleLost_Receiver_Impl
   void
   Receiver_exec_i::read_all (void)
   {
-    if (::CORBA::is_nil (this->reader_.in ()))
+    ::PSL_SampleLost::PSL_SampleLostConnector::Reader_var reader =
+      this->context_->get_connection_info_out_data();
+
+    if (::CORBA::is_nil (reader.in ()))
       {
         return;
       }
@@ -156,7 +159,7 @@ namespace CIAO_PSL_SampleLost_Receiver_Impl
     ::CCM_DDS::ReadInfoSeq readinfoseq;
     try
       {
-        this->reader_->read_all(TestTopic_infos, readinfoseq);
+        reader->read_all(TestTopic_infos, readinfoseq);
         for(CORBA::ULong i = 0; i < readinfoseq.length(); ++i)
           {
             ACE_Time_Value tv;
@@ -234,7 +237,6 @@ namespace CIAO_PSL_SampleLost_Receiver_Impl
   void
   Receiver_exec_i::configuration_complete (void)
   {
-    this->reader_ = this->context_->get_connection_info_out_data();
   }
 
   void
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h
index b9be84351ab..76597eb6db8 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h
@@ -139,7 +139,6 @@ namespace CIAO_PSL_SampleLost_Receiver_Impl
 
   private:
     ::PSL_SampleLost::CCM_Receiver_Context_var context_;
-    ::PSL_SampleLost::PSL_SampleLostConnector::Reader_var reader_;
     read_action_Generator * ticker_;
     CORBA::ULong rate_;
     Atomic_Boolean sample_port_1_;
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp
index d3bfcb631d3..cebf3bb0ce8 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp
@@ -143,8 +143,9 @@ namespace CIAO_QCLE_Test_Receiver_Impl
   void
   Receiver_exec_i::configuration_complete (void)
   {
-    this->reader_ = this->context_->get_connection_info_listen_data ();
-    if (CORBA::is_nil (this->reader_))
+    ::QCLE_Test::QueryConditionListenEventTestConnector::Reader_var reader =
+      this->context_->get_connection_info_listen_data ();
+    if (CORBA::is_nil (reader.in ()))
       {
         ACE_ERROR ((LM_ERROR, "Receiver_exec_i::configuration_complete - "
                               "Error get reader connection.\n"));
@@ -154,15 +155,19 @@ namespace CIAO_QCLE_Test_Receiver_Impl
   void
   Receiver_exec_i::ccm_activate (void)
   {
-
     ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_activate - "
                           "Set filter.\n"));
+                          
     CCM_DDS::QueryFilter filter;
     filter.expression = CORBA::string_dup (QUERY);
     filter.parameters.length (2);
     filter.parameters[0] = CORBA::string_dup (MIN_ITERATION);
     filter.parameters[1] = CORBA::string_dup (MAX_ITERATION);
-    this->reader_->query (filter);
+
+    ::QCLE_Test::QueryConditionListenEventTestConnector::Reader_var reader =
+      this->context_->get_connection_info_listen_data ();
+
+    reader->query (filter);
 
     ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_activate - "
                           "Start listening.\n"));
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.h
index 83cf2f767cc..133ebd677f0 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.h
@@ -88,7 +88,6 @@ namespace CIAO_QCLE_Test_Receiver_Impl
 
   private:
     ::QCLE_Test::CCM_Receiver_Context_var context_;
-    ::QCLE_Test::QueryConditionListenEventTestConnector::Reader_var reader_;
 
     Atomic_ThreadId thread_id_listener_;
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp
index 0511213520c..13e5199e980 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp
@@ -94,14 +94,17 @@ namespace CIAO_ReadGet_Test_Receiver_Impl
   bool
   Receiver_exec_i::check_last ()
   {
+    ::ReadGet_Test::QueryConditionTestConnector::Reader_var reader =
+      this->context_->get_connection_get_port_data ();
+
     try
       {
         QueryConditionTest queryfiltertest_info;
         ::CCM_DDS::ReadInfo readinfo;
-        char key[100];
+        char key[10];
         ACE_OS::sprintf (key, "KEY_%d", this->keys_);
         queryfiltertest_info.symbol = CORBA::string_dup (key);
-        this->reader_->read_one_last (
+        reader->read_one_last (
                 queryfiltertest_info,
                 readinfo,
                 ::DDS::HANDLE_NIL);
@@ -151,9 +154,12 @@ namespace CIAO_ReadGet_Test_Receiver_Impl
   void
   Receiver_exec_i::read_all (void)
   {
+    ::ReadGet_Test::QueryConditionTestConnector::Reader_var reader =
+      this->context_->get_connection_get_port_data ();
+
     QueryConditionTestSeq queryfiltertest_info_seq;
     ::CCM_DDS::ReadInfoSeq readinfo_seq;
-    this->reader_->read_all (queryfiltertest_info_seq, readinfo_seq);
+    reader->read_all (queryfiltertest_info_seq, readinfo_seq);
     if (queryfiltertest_info_seq.length () == 0)
       {
         ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::read_all : "
@@ -168,17 +174,20 @@ namespace CIAO_ReadGet_Test_Receiver_Impl
   void
   Receiver_exec_i::get_all (void)
   {
-    if (::CORBA::is_nil (this->getter_))
+    ::ReadGet_Test::QueryConditionTestConnector::Getter_var getter =
+      this->context_->get_connection_get_port_fresh_data ();
+
+    if (::CORBA::is_nil (getter.in ()))
       {
         ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_all - "
                               "ERROR: No Getter\n"));
       }
-    QueryConditionTest * qf_info = new QueryConditionTest;
+    QueryConditionTest_var qf_info;
     ::CCM_DDS::ReadInfo readinfo;
-    bool result = this->getter_->get_one (qf_info, readinfo);
+    CORBA::Boolean result = getter->get_one (qf_info.out (), readinfo);
     if (result)
       {
-        this->check_iter (*qf_info, "GET");
+        this->check_iter (qf_info.in (), "GET");
       }
     else
       {
@@ -188,10 +197,10 @@ namespace CIAO_ReadGet_Test_Receiver_Impl
       }
     while (result)
       {
-        result = this->getter_->get_one (qf_info, readinfo);
+        result = getter->get_one (qf_info.out (), readinfo);
         if (result)
           {
-            this->check_iter (*qf_info, "GET");
+            this->check_iter (qf_info.in (), "GET");
           }
       }
   }
@@ -234,10 +243,13 @@ namespace CIAO_ReadGet_Test_Receiver_Impl
   void
   Receiver_exec_i::test_exception ()
   {
-    ::CCM_DDS::QueryFilter* query = 0;
+    ::CCM_DDS::QueryFilter_var query;
+    ::ReadGet_Test::QueryConditionTestConnector::Reader_var reader =
+      this->context_->get_connection_get_port_data ();
+
     try
       {
-        query = this->reader_->query ();
+        query = reader->query ();
       }
     catch (const CCM_DDS::InternalError& ex)
       {
@@ -260,10 +272,12 @@ namespace CIAO_ReadGet_Test_Receiver_Impl
   void
   Receiver_exec_i::check_filter ()
   {
-    ::CCM_DDS::QueryFilter * filter = 0;
+    ::CCM_DDS::QueryFilter_var filter;
+    ::ReadGet_Test::QueryConditionTestConnector::Reader_var reader =
+      this->context_->get_connection_get_port_data ();
     try
       {
-        filter = this->reader_->query ();
+        filter = reader->query ();
       }
     catch (const CCM_DDS::InternalError& ex)
       {
@@ -334,12 +348,15 @@ namespace CIAO_ReadGet_Test_Receiver_Impl
   {
     try
       {
+        ::ReadGet_Test::QueryConditionTestConnector::Reader_var reader =
+          this->context_->get_connection_get_port_data ();
+
         ::CCM_DDS::QueryFilter filter;
         filter.expression = CORBA::string_dup ("na");
         filter.parameters.length (2);
         filter.parameters[0] = CORBA::string_dup (MIN_ITERATION_2);
         filter.parameters[1] = CORBA::string_dup (MAX_ITERATION_2);
-        this->reader_->query (filter);
+        reader->query (filter);
         this->current_min_iteration_ = ACE_OS::atoi (MIN_ITERATION_2);
         this->current_max_iteration_ = ACE_OS::atoi (MAX_ITERATION_2);
       }
@@ -363,12 +380,15 @@ namespace CIAO_ReadGet_Test_Receiver_Impl
   Receiver_exec_i::set_filter ()
   {
     ACE_DEBUG ((LM_DEBUG, "Set filter\n"));
+    ::ReadGet_Test::QueryConditionTestConnector::Reader_var reader =
+      this->context_->get_connection_get_port_data ();
+
     ::CCM_DDS::QueryFilter filter;
     filter.expression = CORBA::string_dup (QUERY);
     filter.parameters.length (2);
     filter.parameters[0] = CORBA::string_dup (MIN_ITERATION_1);
     filter.parameters[1] = CORBA::string_dup (MAX_ITERATION_1);
-    this->reader_->query (filter);
+    reader->query (filter);
   }
 
   void
@@ -482,16 +502,16 @@ namespace CIAO_ReadGet_Test_Receiver_Impl
   void
   Receiver_exec_i::ccm_activate (void)
   {
-    this->reader_ = this->context_->get_connection_get_port_data ();
-    this->getter_ = this->context_->get_connection_get_port_fresh_data ();
     this->context_->get_connection_get_port_fresh_data ();
 
+    ::ReadGet_Test::QueryConditionTestConnector::Getter_var getter =
+      this->context_->get_connection_get_port_fresh_data ();
     DDS::Duration_t to;
     to.sec = 5;
     to.nanosec = 0;
-    if (! ::CORBA::is_nil (this->getter_))
+    if (! ::CORBA::is_nil (getter))
       {
-        this->getter_->time_out (to);
+        getter->time_out (to);
       }
     else
       {
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h
index 451204e805a..0e4444793f0 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h
@@ -103,8 +103,6 @@ namespace CIAO_ReadGet_Test_Receiver_Impl
 
   private:
     ::ReadGet_Test::CCM_Receiver_Context_var context_;
-    ::ReadGet_Test::QueryConditionTestConnector::Reader_var reader_;
-    ::ReadGet_Test::QueryConditionTestConnector::Getter_var getter_;
 
     ReadGetRestarter_var restarter_;
     CORBA::UShort   iterations_;
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.cpp
index 5df63ff2791..1719eb4f86e 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.cpp
@@ -150,8 +150,9 @@ namespace CIAO_QCLS_Test_Receiver_Impl
   void
   Receiver_exec_i::configuration_complete (void)
   {
-    this->reader_ = this->context_->get_connection_info_state_data ();
-    if (CORBA::is_nil (this->reader_.in ()))
+    ::QCLS_Test::QueryConditionListenStateTestConnector::Reader_var reader =
+      this->context_->get_connection_info_state_data ();
+    if (CORBA::is_nil (reader.in ()))
       {
         ACE_ERROR ((LM_ERROR, "Receiver_exec_i::configuration_complete - "
                               "Error get reader connection.\n"));
@@ -169,7 +170,10 @@ namespace CIAO_QCLS_Test_Receiver_Impl
     filter.parameters.length (2);
     filter.parameters[0] = CORBA::string_dup (MIN_ITERATION);
     filter.parameters[1] = CORBA::string_dup (MAX_ITERATION);
-    this->reader_->query (filter);
+    ::QCLS_Test::QueryConditionListenStateTestConnector::Reader_var reader =
+      this->context_->get_connection_info_state_data ();
+
+    reader->query (filter);
 
     ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_activate - "
                           "Start listening.\n"));
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.h
index 88cfce6e2c9..5ea484f0cd3 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.h
@@ -94,7 +94,6 @@ namespace CIAO_QCLS_Test_Receiver_Impl
 
   private:
     ::QCLS_Test::CCM_Receiver_Context_var context_;
-    ::QCLS_Test::QueryConditionListenStateTestConnector::Reader_var reader_;
 
     Atomic_ThreadId thread_id_listener_;
 
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp
index 9527d2e3a6a..10f17efe9d9 100644
--- a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp
@@ -82,16 +82,19 @@ namespace CIAO_Reader_Test_Receiver_Impl
   bool
   Receiver_exec_i::check_last ()
   {
+    ::Reader_Test::ReaderTestConnector::Reader_var reader =
+      this->context_->get_connection_info_out_data();
+
     try
       {
-        if (! ::CORBA::is_nil (this->reader_))
+        if (! ::CORBA::is_nil (reader.in ()))
           {
             ReaderTest readertest_info;
             ::CCM_DDS::ReadInfo readinfo;
-            char key[100];
+            char key[10];
             ACE_OS::sprintf (key, "KEY_%d", this->keys_);
             readertest_info.key = CORBA::string_dup (key);
-            this->reader_->read_one_last (
+            reader->read_one_last (
                     readertest_info,
                     readinfo,
                     ::DDS::HANDLE_NIL);
@@ -114,22 +117,22 @@ namespace CIAO_Reader_Test_Receiver_Impl
   void
   Receiver_exec_i::read_one_last (bool test_handles)
   {
+    ::Reader_Test::ReaderTestConnector::Reader_var reader =
+      this->context_->get_connection_info_out_data();
+
     try
       {
         for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i)
           {
             ReaderTest readertest_info;
             ::CCM_DDS::ReadInfo readinfo;
-            char key[100];
+            char key[10];
             ACE_OS::sprintf (key, "KEY_%d", i);
             readertest_info.key = CORBA::string_dup (key);
             DDS::InstanceHandle_t hnd = test_handles
                 ? this->handles_[key]
                 : ::DDS::HANDLE_NIL;
-            this->reader_->read_one_last (
-                    readertest_info,
-                    readinfo,
-                    hnd);
+            reader->read_one_last (readertest_info, readinfo, hnd);
             if (readertest_info.iteration == this->iterations_)
               {
                 ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ONE LAST: ")
@@ -174,20 +177,23 @@ namespace CIAO_Reader_Test_Receiver_Impl
   void
   Receiver_exec_i::read_one_all (bool test_handles)
   {
+    ::Reader_Test::ReaderTestConnector::Reader_var reader =
+      this->context_->get_connection_info_out_data();
+
     try
       {
         for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i)
           {
-            ReaderTest              readertest_info;
+            ReaderTest readertest_info;
             ReaderTestSeq readertest_info_seq;
             ::CCM_DDS::ReadInfoSeq readinfo_seq;
-            char key[100];
+            char key[10];
             ACE_OS::sprintf (key, "KEY_%d", i);
             readertest_info.key = CORBA::string_dup (key);
             DDS::InstanceHandle_t hnd = test_handles
                 ? this->handles_[key]
                 : ::DDS::HANDLE_NIL;
-            this->reader_->read_one_all (
+            reader->read_one_all (
                     readertest_info,
                     readertest_info_seq,
                     readinfo_seq,
@@ -251,11 +257,14 @@ namespace CIAO_Reader_Test_Receiver_Impl
   void
   Receiver_exec_i::read_last (void)
   {
+    ::Reader_Test::ReaderTestConnector::Reader_var reader =
+      this->context_->get_connection_info_out_data();
+
     try
       {
         ReaderTestSeq readertest_info_seq;
         ::CCM_DDS::ReadInfoSeq readinfo_seq;
-        this->reader_->read_last (readertest_info_seq, readinfo_seq);
+        reader->read_last (readertest_info_seq, readinfo_seq);
 
         if (readertest_info_seq.length () != this->keys_)
           {
@@ -299,11 +308,14 @@ namespace CIAO_Reader_Test_Receiver_Impl
   void
   Receiver_exec_i::read_all (void)
   {
+    ::Reader_Test::ReaderTestConnector::Reader_var reader =
+      this->context_->get_connection_info_out_data();
+
     try
       {
         ReaderTestSeq readertest_info_seq;
         ::CCM_DDS::ReadInfoSeq readinfo_seq;
-        this->reader_->read_all (readertest_info_seq, readinfo_seq);
+        reader->read_all (readertest_info_seq, readinfo_seq);
 
         CORBA::ULong const nr_samples = this->keys_ * this->iterations_;
         if (readertest_info_seq.length () != nr_samples)
@@ -393,12 +405,15 @@ namespace CIAO_Reader_Test_Receiver_Impl
   {
     // test exception handling
     bool except_caught = false;
+    ::Reader_Test::ReaderTestConnector::Reader_var reader =
+      this->context_->get_connection_info_out_data();
+
     try
       {
         ReaderTest readertest_info;
         readertest_info.key = CORBA::string_dup ("KEY_0");
         ::CCM_DDS::ReadInfo readinfo;
-        this->reader_->read_one_last (readertest_info, readinfo, ::DDS::HANDLE_NIL);
+        reader->read_one_last (readertest_info, readinfo, ::DDS::HANDLE_NIL);
       }
     catch (const CCM_DDS::InternalError& )
       {
@@ -420,6 +435,9 @@ namespace CIAO_Reader_Test_Receiver_Impl
   Receiver_exec_i::test_exception_with_handles ()
   {
     // test exception handling
+    ::Reader_Test::ReaderTestConnector::Reader_var reader =
+      this->context_->get_connection_info_out_data();
+
     bool except_caught = false;
     try
       {
@@ -427,7 +445,7 @@ namespace CIAO_Reader_Test_Receiver_Impl
         readertest_info.key = CORBA::string_dup ("KEY_1");
         ::CCM_DDS::ReadInfo readinfo;
         DDS::InstanceHandle_t hnd = this->handles_["KEY_2"];
-        this->reader_->read_one_last (readertest_info, readinfo, hnd);
+        reader->read_one_last (readertest_info, readinfo, hnd);
       }
     catch (const CCM_DDS::InternalError& )
       {
@@ -450,11 +468,14 @@ namespace CIAO_Reader_Test_Receiver_Impl
   void
   Receiver_exec_i::read_no_data ()
   {
+    ::Reader_Test::ReaderTestConnector::Reader_var reader =
+      this->context_->get_connection_info_out_data();
+
     try
       {
         ReaderTestSeq readertest_info_seq ;
         ::CCM_DDS::ReadInfoSeq readinfo_seq;
-        this->reader_->read_all (readertest_info_seq, readinfo_seq);
+        reader->read_all (readertest_info_seq, readinfo_seq);
 
         if (readertest_info_seq.length () > 0)
           {
@@ -580,7 +601,6 @@ namespace CIAO_Reader_Test_Receiver_Impl
   void
   Receiver_exec_i::configuration_complete (void)
   {
-    this->reader_ = this->context_->get_connection_info_out_data();
   }
 
   void
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h
index d5c65f8aa08..02f5f71b52e 100644
--- a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h
@@ -94,9 +94,7 @@ namespace CIAO_Reader_Test_Receiver_Impl
     void keys (::CORBA::UShort keys);
 
     // Operations from Components::SessionComponent.
-    virtual void
-    set_session_context (
-      ::Components::SessionContext_ptr ctx);
+    virtual void set_session_context (::Components::SessionContext_ptr ctx);
 
     virtual void configuration_complete (void);
 
@@ -106,7 +104,6 @@ namespace CIAO_Reader_Test_Receiver_Impl
 
   private:
     ::Reader_Test::CCM_Receiver_Context_var context_;
-    ::Reader_Test::ReaderTestConnector::Reader_var reader_;
     CORBA::UShort iterations_;
     CORBA::UShort keys_;
     CORBA::Boolean has_run_;
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp
index ff287f7bdc7..581b177762d 100644
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp
@@ -99,15 +99,18 @@ namespace CIAO_SL_Disabled_Receiver_Impl
   void
   Receiver_exec_i::read_all (void)
   {
-    if (::CORBA::is_nil (this->reader_.in ()))
+    ::SL_Disabled::SL_DisabledConnector::Reader_var reader =
+      this->context_->get_connection_info_out_data ();
+
+    if (::CORBA::is_nil (reader.in ()))
       {
         return;
       }
-    TestTopicSeq TestTopic_infos;
-    ::CCM_DDS::ReadInfoSeq readinfoseq;
     try
       {
-        this->reader_->read_all(TestTopic_infos, readinfoseq);
+        TestTopicSeq TestTopic_infos;
+        ::CCM_DDS::ReadInfoSeq readinfoseq;
+        reader->read_all(TestTopic_infos, readinfoseq);
         for (CORBA::ULong i = 0; i < readinfoseq.length(); ++i)
           {
             this->updater_data_ = true;
@@ -162,7 +165,6 @@ namespace CIAO_SL_Disabled_Receiver_Impl
   void
   Receiver_exec_i::configuration_complete (void)
   {
-    this->reader_ = this->context_->get_connection_info_out_data ();
   }
 
   void
@@ -178,8 +180,9 @@ namespace CIAO_SL_Disabled_Receiver_Impl
       }
 
     lc->mode (::CCM_DDS::NOT_ENABLED);
-    // calculate the interval time
-    long usec = 1000000 / this->rate_;
+    
+    // Calculate the interval time
+    long const usec = 1000000 / this->rate_;
     if (this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->schedule_timer (
                                           this->ticker_,
                                           0,
@@ -203,15 +206,17 @@ namespace CIAO_SL_Disabled_Receiver_Impl
     if (!this->no_operation_.value ()|| !this->updater_data_.value())
       {
 
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Received an unexpected ")
-                               ACE_TEXT (" operation. StateListener or Updater doesn't work in Receiver")
+         ACE_ERROR ((LM_ERROR,
+                     ACE_TEXT ("ERROR: Received an unexpected ")
+                     ACE_TEXT (" operation. StateListener or Updater doesn't work in Receiver")
                     ));
       }
 
     else
       {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK : Haven't received an  unexpected ")
-                              ACE_TEXT (" oparation from StateListener in Receiver")
+        ACE_DEBUG ((LM_DEBUG,
+                    ACE_TEXT ("OK : Haven't received an  unexpected ")
+                    ACE_TEXT (" oparation from StateListener in Receiver")
                    ));
       }
   }
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h
index fbb9325882d..563539c964d 100644
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h
@@ -103,7 +103,6 @@ namespace CIAO_SL_Disabled_Receiver_Impl
 
   private:
     ::SL_Disabled::CCM_Receiver_Context_var context_;
-    ::SL_Disabled::SL_DisabledConnector::Reader_var reader_;
     read_action_Generator * ticker_;
 
     CORBA::ULong rate_;
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp
index d824260966e..d0d8e720e88 100644
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp
@@ -193,15 +193,18 @@ namespace CIAO_SL_ManyByMany_Receiver_Impl
   void
   Receiver_exec_i::read_all (void)
   {
-    if (::CORBA::is_nil (this->reader_.in ()))
+    ::SL_ManyByMany::SLManyByManyConnector::Reader_var reader =
+      this->context_->get_connection_info_out_data();
+
+    if (::CORBA::is_nil (reader.in ()))
       {
         return;
       }
-    TestTopicSeq TestTopic_infos;
-    ::CCM_DDS::ReadInfoSeq readinfoseq;
     try
       {
-        this->reader_->read_all(TestTopic_infos, readinfoseq);
+        TestTopicSeq TestTopic_infos;
+        ::CCM_DDS::ReadInfoSeq readinfoseq;
+        reader->read_all(TestTopic_infos, readinfoseq);
         for(CORBA::ULong i = 0; i < readinfoseq.length(); ++i)
           {
             ACE_Time_Value tv;
@@ -262,7 +265,6 @@ namespace CIAO_SL_ManyByMany_Receiver_Impl
   void
   Receiver_exec_i::configuration_complete (void)
   {
-    this->reader_ = this->context_->get_connection_info_out_data();
   }
 
   void
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h
index a1f348564f6..bfd23bc1ade 100644
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h
@@ -119,7 +119,6 @@ namespace CIAO_SL_ManyByMany_Receiver_Impl
 
   private:
     ::SL_ManyByMany::CCM_Receiver_Context_var context_;
-    ::SL_ManyByMany::SLManyByManyConnector::Reader_var reader_;
     read_action_Generator * ticker_;
     CORBA::ULong rate_;
     Atomic_Boolean no_operation_;
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp
index f174fcd1c04..c731c75d173 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp
@@ -154,7 +154,7 @@ namespace CIAO_Unkeyed_Test_Receiver_Impl
   ::CCM_DDS::CCM_PortStatusListener_ptr
   Receiver_exec_i::get_info_out_status (void)
   {
-    return 0;
+    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
   }
 
   ::CCM_DDS::CCM_ConnectorStatusListener_ptr
@@ -186,13 +186,14 @@ namespace CIAO_Unkeyed_Test_Receiver_Impl
   Receiver_exec_i::ccm_activate (void)
   {
     ::CCM_DDS::DataListenerControl_var lc =
-    this->context_->get_connection_info_out_data_control ();
+      this->context_->get_connection_info_out_data_control ();
 
     if (::CORBA::is_nil (lc.in ()))
       {
         ACE_ERROR ((LM_ERROR, ACE_TEXT ("Error:  Listener control receptacle is null!\n")));
         throw CORBA::INTERNAL ();
       }
+      
     lc->mode (::CCM_DDS::ONE_BY_ONE);
   }
 
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h
index fed45cff5ba..67b19f11239 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h
@@ -103,8 +103,6 @@ namespace CIAO_Unkeyed_Test_Receiver_Impl
 
   private:
     ::Unkeyed_Test::CCM_Receiver_Context_var context_;
-    ::Unkeyed_Test::UnkeyedTestConnector::Reader_var reader_;
-    ::Unkeyed_Test::UnkeyedTestConnector::Getter_var getter_;
 
     CORBA::UShort iterations_;
     Atomic_ULong received_;
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp
index 09c80e0a732..301a7ec4258 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp
@@ -84,7 +84,7 @@ namespace CIAO_Writer_Receiver_Impl
   ::CCM_DDS::CCM_PortStatusListener_ptr
   Receiver_exec_i::get_info_out_status (void)
   {
-    return 0;
+    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
   }
 
   // Operations from Components::SessionComponent.