Thu Aug 29 11:11:22 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>

        * connectors/dds4ccm/impl/Coherent_Changes_Guard.h:
        * connectors/dds4ccm/impl/DDS_Event_Connector_T.h:
        * connectors/dds4ccm/impl/DDS_Listen_T.h:
        * connectors/dds4ccm/impl/DDS_Listen_T.cpp:
        * connectors/dds4ccm/impl/DDS_StateListen_T.h:
        * connectors/dds4ccm/impl/DDS_StateListen_T.cpp:
        * connectors/dds4ccm/impl/DDS_State_Connector_T.h:
        * connectors/dds4ccm/impl/DataReaderListener_T.h:
        * connectors/dds4ccm/impl/DataReaderListener_T.cpp:
        * connectors/dds4ccm/impl/DataReaderStateListener_T.h:
        * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp:
        * connectors/dds4ccm/impl/Getter_T.h:
        * connectors/dds4ccm/impl/LocalObject.h:
        * connectors/dds4ccm/impl/Utils.h:
          Fixes for the DDS State connector. The semantics of this
          connector is that the state is kept in DDS, but the listeners
          where doing a take which removed the data from DDS. The basic
          and extended listener ports C++ templates are extended with a
          new template argument which is used to control the semantics
          of the listener, DDS4CCM_READ or DDS4CCM_TAKE. The State
connector
          does use read, the Event connector does use take. This fixes
          bugzilla 4123

        * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h:
        * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp:
        * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h:
        * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp:
        * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h:
        * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/ListenManyByMany/descriptors/Plan.cdp:
        * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.h:
        * connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.cpp:
        * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_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/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h:
        * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.h:
        * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp:
        * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp:
          Extended a few tests to check the state in DDS after they
          have received some samples through the listener. In previous
          versions this never returned data, with the updated DDS4CCM
          State connector semantics this now returns data

15 files changed, 191 insertions, 219 deletions

diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp
index 3c4035abe57..26f86d157f9 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp
@@ -1,30 +1,6 @@
 // -*- C++ -*-
 // $Id$
 
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.cs.wustl.edu/~schmidt/TAO.html
- **/
-
 #include "Keyed_Test_Sender_exec.h"
 #include "tao/ORB_Core.h"
 #include "ace/Reactor.h"
@@ -113,6 +89,7 @@ namespace CIAO_Keyed_Test_Sender_Impl
     : rate_ (1)
       , keys_ (5)
       , iterations_ (10)
+      , ready_to_start_ (false)
   {
     ACE_NEW_THROW_EX (this->ticker_,
                       pulse_Generator (*this),
@@ -204,6 +181,7 @@ namespace CIAO_Keyed_Test_Sender_Impl
   void
   Sender_exec_i::get_started (void)
   {
+    this->ready_to_start_ = true;
     this->start ();
 
     ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
@@ -226,6 +204,12 @@ namespace CIAO_Keyed_Test_Sender_Impl
   Sender_exec_i::stop (void)
   {
     this->reactor ()->cancel_timer (this->ticker_);
+
+    if (!this->ready_to_start_.value())
+      {
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::stop - ")
+                              ACE_TEXT ("ERROR Sender never got ready to start\n")));
+      }
   }
 
   // Component attributes and port operations.
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h
index 09afa3d3157..9390b0ae894 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h
@@ -1,29 +1,6 @@
 // -*- C++ -*-
 // $Id$
 
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.cs.wustl.edu/~schmidt/TAO.html
- **/
 #ifndef CIAO_KEYED_TEST_SENDER_EXEC_LVAFIH_H_
 #define CIAO_KEYED_TEST_SENDER_EXEC_LVAFIH_H_
 
@@ -42,6 +19,7 @@
 
 namespace CIAO_Keyed_Test_Sender_Impl
 {
+  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
   class Sender_exec_i;
 
   /**
@@ -169,7 +147,7 @@ namespace CIAO_Keyed_Test_Sender_Impl
 
     Keyed_Test_Table ktests_;
     Keyed_Test_Table::iterator last_key_;
-
+    Atomic_Boolean ready_to_start_;
     //@}
 
     //@{
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 b2b8dffeb42..738d45c2020 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
@@ -11,10 +11,14 @@ namespace CIAO_LMBM_Test_Receiver_Impl
   // ListenManyByManyTest_Listener_exec_i
   //============================================================
   ListenManyByManyTest_Listener_exec_i::ListenManyByManyTest_Listener_exec_i (
-                                              Atomic_ULong &received_one_by_one,
-                                              Atomic_ULong &received_many_by_many)
-    : received_one_by_one_ (received_one_by_one),
-      received_many_by_many_ (received_many_by_many)
+    ::LMBM_Test::CCM_Receiver_Context_ptr context,
+    Atomic_ULong &received_one_by_one,
+    Atomic_ULong &received_many_by_many,
+    Atomic_ULong &samples_read)
+    : context_ (::LMBM_Test::CCM_Receiver_Context::_duplicate (context)),
+      received_one_by_one_ (received_one_by_one),
+      received_many_by_many_ (received_many_by_many),
+      samples_read_ (samples_read)
   {
   }
 
@@ -38,19 +42,19 @@ namespace CIAO_LMBM_Test_Receiver_Impl
   {
     if (an_instance.length () == 0)
       {
-        ACE_ERROR ((LM_ERROR, "ERROR: ListenManyByManyTest_Listener_exec_i::on_many_data:"
-                               "instance sequence length is nil\n"));
+        ACE_ERROR ((LM_ERROR, "ERROR: ListenManyByManyTest_Listener_exec_i::on_many_data: "
+                              "instance sequence length is nil\n"));
         return;
       }
     for (CORBA::ULong i = 0 ; i < info.length(); ++i)
       {
-        ACE_DEBUG ((LM_DEBUG, "ListenManyByManyTest_Listener_exec_i::on_many_data:"
+        ACE_DEBUG ((LM_DEBUG, "ListenManyByManyTest_Listener_exec_i::on_many_data: "
                                "key <%C> - iteration <%d>\n",
                                an_instance[i].key.in (),
                                an_instance[i].iteration));
         if (info[i].instance_handle == ::DDS::HANDLE_NIL)
           {
-            ACE_ERROR ((LM_ERROR, "ERROR: ListenManyByManyTest_Listener_exec_i::on_many_data:"
+            ACE_ERROR ((LM_ERROR, "ERROR: ListenManyByManyTest_Listener_exec_i::on_many_data: "
                                 "instance handle %d seems to be nil"
                                 "key <%C> - iteration <%d>\n",
                                  i,
@@ -60,7 +64,7 @@ namespace CIAO_LMBM_Test_Receiver_Impl
         if (info[i].source_timestamp.sec == 0 &&
             info[i].source_timestamp.nanosec == 0)
           {
-            ACE_ERROR ((LM_ERROR, "ERROR: ListenManyByManyTest_Listener_exec_i::on_one_data: "
+            ACE_ERROR ((LM_ERROR, "ERROR: ListenManyByManyTest_Listener_exec_i::on_many_data: "
                                 "source timestamp seems to be invalid (nil) "
                                 "key <%C> - iteration <%d>\n",
                                 an_instance[i].key.in (),
@@ -68,6 +72,30 @@ namespace CIAO_LMBM_Test_Receiver_Impl
           }
       }
     this->received_many_by_many_ += an_instance.length ();
+    try
+      {
+        ::LMBM_Test::ListenManyByManyTestConnector::Reader_var reader =
+          this->context_->get_connection_info_listen_data ();
+        if (::CORBA::is_nil (reader.in ()))
+          {
+            ACE_ERROR ((LM_ERROR, "ListenManyByManyTest_Listener_exec_i::on_many_data - "
+                      "ERROR: Reader seems nil\n"));
+          }
+        ::ListenManyByManyTestSeq seq;
+        ::CCM_DDS::ReadInfoSeq infos;
+        reader->read_all (seq, infos);
+        this->samples_read_ += seq.length ();
+
+        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ListenManyByManyTest_Listener_exec_i::on_many_data - ")
+                              ACE_TEXT ("Read <%u> samples\n"),
+                              seq.length ()));
+      }
+    catch (const CCM_DDS::InternalError& ex)
+      {
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
+                     ACE_TEXT ("when using reader->read_all: index <%d> - retval <%d>\n"),
+                     ex.index, ex.error_code));
+      }
   }
 
   //============================================================
@@ -76,6 +104,7 @@ namespace CIAO_LMBM_Test_Receiver_Impl
   Receiver_exec_i::Receiver_exec_i (void)
     : received_one_by_one_ (0),
       received_many_by_many_ (0),
+      samples_read_ (0),
       iterations_ (10),
       keys_ (5)
   {
@@ -97,8 +126,10 @@ namespace CIAO_LMBM_Test_Receiver_Impl
   Receiver_exec_i::get_info_listen_data_listener (void)
   {
     return new ListenManyByManyTest_Listener_exec_i (
-                this->received_one_by_one_,
-                this->received_many_by_many_);
+      this->context_.in (),
+      this->received_one_by_one_,
+      this->received_many_by_many_,
+      this->samples_read_);
   }
 
   ::CCM_DDS::CCM_PortStatusListener_ptr
@@ -204,6 +235,15 @@ namespace CIAO_LMBM_Test_Receiver_Impl
                                 "many_by_many callback. "
                                 "Test passed!\n"));
       }
+    if (this->samples_read_.value () == 0)
+      {
+        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: read no samples\n")));
+      }
+    else
+      {
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: read <%u> samples\n"),
+                this->samples_read_.value ()));
+      }
   }
 
   extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h
index 74a7d84572f..86261f0de2a 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h
@@ -30,8 +30,10 @@ namespace CIAO_LMBM_Test_Receiver_Impl
   {
   public:
     ListenManyByManyTest_Listener_exec_i (
-                            Atomic_ULong &received_one_by_one,
-                            Atomic_ULong &received_many_by_many);
+      ::LMBM_Test::CCM_Receiver_Context_ptr context,
+      Atomic_ULong &received_one_by_one,
+      Atomic_ULong &received_many_by_many,
+      Atomic_ULong &samples_read_);
     virtual ~ListenManyByManyTest_Listener_exec_i (void);
 
     virtual void
@@ -43,8 +45,10 @@ namespace CIAO_LMBM_Test_Receiver_Impl
       const ListenManyByManyTestSeq & an_instance,
       const ::CCM_DDS::ReadInfoSeq & info);
   private:
+    ::LMBM_Test::CCM_Receiver_Context_var context_;
     Atomic_ULong &received_one_by_one_;
     Atomic_ULong &received_many_by_many_;
+    Atomic_ULong &samples_read_;
   };
 
   //============================================================
@@ -92,6 +96,7 @@ namespace CIAO_LMBM_Test_Receiver_Impl
 
     Atomic_ULong received_one_by_one_;
     Atomic_ULong received_many_by_many_;
+    Atomic_ULong samples_read_;
 
     CORBA::UShort iterations_;
     CORBA::UShort keys_;
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/Plan.cdp
index 3113997f546..d529ec16667 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/Plan.cdp
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/Plan.cdp
@@ -285,6 +285,26 @@
       <resourceType>Local_Interface</resourceType>
     </deployRequirement>
     <internalEndpoint>
+      <portName>info_listen_data</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="ReceiverComponentInstance" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>push_consumer_data</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="LMBM_Test_ConnectorComponentInstance2" />
+    </internalEndpoint>
+  </connection>
+
+  <connection>
+    <name>info_listen_data_listener</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
       <portName>info_listen_data_listener</portName>
       <provider>true</provider>
       <kind>Facet</kind>
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.h b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.h
index 742e45bf8e8..5b8ba748238 100644
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.h
+++ b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.h
@@ -256,10 +256,11 @@ private:
       typename CCM_TYPE::push_consumer_cl_traits,
       typename DDS_TYPE::typed_reader_type,
       typename DDS_TYPE::value_type,
-      SEQ_TYPE>
+      SEQ_TYPE,
+      CIAO::DDS4CCM::DDS4CCM_TAKE>
     push_consumer_cl_;
 
-  //connection to the receiver implementation
+  /// Connection to the receiver implementation
   typename CCM_TYPE::push_consumer_cl_traits::data_listener_type::_var_type dl_;
 
   CORBA::String_var topic_name_sq_;
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.cpp
index 29eaa54ddda..6b649b5256a 100644
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.cpp
@@ -189,7 +189,7 @@ namespace CIAO_MultipleTemp_Sender_Impl
     catch (const CCM_DDS::InternalError& ex)
     {
       ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                   ACE_TEXT ("whit update_many: index <%d> - retval <%d>\n"),
+                   ACE_TEXT ("with update_many: index <%d> - retval <%d>\n"),
                    ex.index, ex.error_code));
       result = false;
     }
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.cpp
index daf84e16bbd..43e6c01ed5b 100644
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.cpp
@@ -309,7 +309,7 @@ namespace CIAO_SL_Disabled_Sender_Impl
     catch (const CCM_DDS::InternalError& ex)
       {
         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                     ACE_TEXT ("whit update_many: index <%d> - retval <%d>\n"),
+                     ACE_TEXT ("with update_many: index <%d> - retval <%d>\n"),
                      ex.index, ex.error_code));
         return false;
       }
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 66981b6442a..40219975a82 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
@@ -1,30 +1,6 @@
 // -*- C++ -*-
 // $Id$
 
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.cs.wustl.edu/~schmidt/TAO.html
- **/
-
 #include "SL_ManyByMany_Receiver_exec.h"
 #include "tao/ORB_Core.h"
 #include "ace/Reactor.h"
@@ -71,7 +47,8 @@ namespace CIAO_SL_ManyByMany_Receiver_Impl
         Atomic_Long &on_many_upd_trigger,
         Atomic_Long &on_deletion,
         Atomic_Bool &create_data,
-        Atomic_Bool &update_data)
+        Atomic_Bool &update_data,
+        Atomic_Long &samples_read)
     : ciao_context_ (
         ::SL_ManyByMany::CCM_Receiver_Context::_duplicate (ctx))
       , no_operation_ (no_operation)
@@ -81,6 +58,7 @@ namespace CIAO_SL_ManyByMany_Receiver_Impl
       , on_deletion_ (on_deletion)
       , create_data_ (create_data)
       , update_data_ (update_data)
+      , samples_read_ (samples_read)
   {
   }
 
@@ -165,6 +143,36 @@ namespace CIAO_SL_ManyByMany_Receiver_Impl
             this->update_data_ = true;
           }
        }
+
+    // When we have received all updates, check if there is
+    // something left in the cache
+    if(this->on_many_update_.value () == ON_MANY_EXPECTED)
+      {
+        try
+          {
+            SL_ManyByMany::SLManyByManyConnector::Reader_var reader =
+              this->ciao_context_->get_connection_info_out_data ();
+            if (::CORBA::is_nil (reader.in ()))
+              {
+                ACE_ERROR ((LM_ERROR, "info_out_data_listener_exec_i::on_many_updates - "
+                          "ERROR: Reader seems nil\n"));
+              }
+            ::TestTopicSeq seq;
+            ::CCM_DDS::ReadInfoSeq infos;
+            reader->read_all (seq, infos);
+            this->samples_read_ += seq.length ();
+
+            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("info_out_data_listener_exec_i::on_many_updates - ")
+                                  ACE_TEXT ("Read <%u> samples\n"),
+                                  seq.length ()));
+          }
+        catch (const CCM_DDS::InternalError& ex)
+          {
+            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
+                        ACE_TEXT ("when using reader->read_all: index <%d> - retval <%d>\n"),
+                        ex.index, ex.error_code));
+          }
+      }
   }
 
   void
@@ -259,6 +267,7 @@ namespace CIAO_SL_ManyByMany_Receiver_Impl
       , create_data_ (false)
       , update_data_ (false)
       , reader_data_ (0)
+      , samples_read_ (0)
   {
     ACE_NEW_THROW_EX (this->ticker_,
                       read_action_Generator (*this),
@@ -351,7 +360,8 @@ namespace CIAO_SL_ManyByMany_Receiver_Impl
             this->on_many_upd_trigger_,
             this->on_deletion_,
             this->create_data_,
-            this->update_data_),
+            this->update_data_,
+            this->samples_read_),
             ::SL_ManyByMany::SLManyByManyConnector::CCM_StateListener::_nil ());
 
           this->ciao_info_out_data_listener_ = tmp;
@@ -518,7 +528,7 @@ namespace CIAO_SL_ManyByMany_Receiver_Impl
       {
          ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: did receive the expected ")
                                ACE_TEXT ("number of 'on_many_update' samples: ")
-                               ACE_TEXT ("expected <%d> - received <%d>,")
+                               ACE_TEXT ("expected <%d> - received <%d>, ")
                                ACE_TEXT ("on_many_update triggered at <%d> times.\n"),
                                ON_MANY_EXPECTED,
                                this->on_many_update_.value (),
@@ -578,6 +588,15 @@ namespace CIAO_SL_ManyByMany_Receiver_Impl
                                this->reader_data_.value ()
                     ));
       }
+    if (this->samples_read_.value () == 0)
+      {
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: read no samples\n")));
+      }
+    else
+      {
+        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: read <%u> samples\n"),
+                this->samples_read_.value ()));
+      }
   }
 
   extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
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 5674cabf36d..1284d89d6c3 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
@@ -1,29 +1,6 @@
 // -*- C++ -*-
 // $Id$
 
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.cs.wustl.edu/~schmidt/TAO.html
- **/
 #ifndef CIAO_SL_MANYBYMANY_RECEIVER_EXEC_4U4QJF_H_
 #define CIAO_SL_MANYBYMANY_RECEIVER_EXEC_4U4QJF_H_
 
@@ -84,7 +61,8 @@ namespace CIAO_SL_ManyByMany_Receiver_Impl
       Atomic_Long &on_many_upd_trigger,
       Atomic_Long &on_deletion,
       Atomic_Bool &create_data,
-      Atomic_Bool &update_data);
+      Atomic_Bool &update_data,
+      Atomic_Long &samples_read);
     virtual ~info_out_data_listener_exec_i (void);
 
     //@{
@@ -116,6 +94,7 @@ namespace CIAO_SL_ManyByMany_Receiver_Impl
      Atomic_Long &on_deletion_;
      Atomic_Bool &create_data_;
      Atomic_Bool &update_data_;
+     Atomic_Long &samples_read_;
   };
 
   /**
@@ -210,7 +189,7 @@ namespace CIAO_SL_ManyByMany_Receiver_Impl
     Atomic_Bool create_data_;
     Atomic_Bool update_data_;
     Atomic_Long reader_data_;
-
+    Atomic_Long samples_read_;
     //@}
 
     //@{
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp
index d0c89b3fe80..e3ba1e99626 100644
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp
@@ -1,32 +1,7 @@
 // -*- C++ -*-
 // $Id$
 
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.cs.wustl.edu/~schmidt/TAO.html
- **/
-
 #include "SL_OneByOne_Receiver_exec.h"
-
 #include "dds4ccm/impl/dds4ccm_conf.h"
 
 #define ON_CREATION_EXPECTED 4
@@ -39,13 +14,13 @@ namespace CIAO_SL_OneByOne_Receiver_Impl
   /**
    * Facet Executor Implementation Class: info_out_data_listener_exec_i
    */
-
   info_out_data_listener_exec_i::info_out_data_listener_exec_i (
         ::SL_OneByOne::CCM_Receiver_Context_ptr ctx,
         Atomic_Long &on_many_updates,
         Atomic_Long &on_creation,
         Atomic_Long &on_one_update,
         Atomic_Long &on_deletion,
+        Atomic_Long &samples_read,
         ACE_Thread_ID &thread_id)
     : ciao_context_ (
         ::SL_OneByOne::CCM_Receiver_Context::_duplicate (ctx))
@@ -53,6 +28,7 @@ namespace CIAO_SL_OneByOne_Receiver_Impl
       , on_creation_ (on_creation)
       , on_one_update_ (on_one_update)
       , on_deletion_ (on_deletion)
+      , samples_read_ (samples_read)
       , thread_id_  (thread_id)
   {
   }
@@ -104,6 +80,36 @@ namespace CIAO_SL_OneByOne_Receiver_Impl
       {
         ++this->on_one_update_;
       }
+
+    // When we have received all updates, check if there is something
+    // left in the cache
+    if (this->on_one_update_.value () == ON_ONE_UPDATE_EXPECTED)
+      {
+        try
+          {
+            ::SL_OneByOne::SL_OneByOneConnector::Reader_var reader =
+              this->ciao_context_->get_connection_info_out_data ();
+            if (::CORBA::is_nil (reader.in ()))
+              {
+                ACE_ERROR ((LM_ERROR, "info_out_data_listener_exec_i::on_one_update - "
+                          "ERROR: Reader seems nil\n"));
+              }
+            ::TestTopicSeq seq;
+            ::CCM_DDS::ReadInfoSeq infos;
+            reader->read_all (seq, infos);
+            this->samples_read_ += seq.length ();
+
+            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("StateListener_exec_i::on_one_update - ")
+                                  ACE_TEXT ("Read <%u> samples\n"),
+                                  seq.length ()));
+          }
+        catch (const CCM_DDS::InternalError& ex)
+          {
+            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
+                        ACE_TEXT ("when using reader->read_all: index <%d> - retval <%d>\n"),
+                        ex.index, ex.error_code));
+          }
+      }
   }
 
   void
@@ -200,6 +206,7 @@ namespace CIAO_SL_OneByOne_Receiver_Impl
       on_creation_ (0),
       on_one_update_ (0),
       on_deletion_ (0),
+      samples_read_ (0),
       thread_id_listener_ (0, 0)
   {
   }
@@ -226,6 +233,7 @@ namespace CIAO_SL_OneByOne_Receiver_Impl
             this->on_creation_,
             this->on_one_update_,
             this->on_deletion_,
+            this->samples_read_,
             this->thread_id_listener_),
           ::SL_OneByOne::SL_OneByOneConnector::CCM_StateListener::_nil ());
 
@@ -295,7 +303,6 @@ namespace CIAO_SL_OneByOne_Receiver_Impl
   void
   Receiver_exec_i::ccm_passivate (void)
   {
-    /* Your code here. */
   }
 
   void
@@ -373,6 +380,15 @@ namespace CIAO_SL_OneByOne_Receiver_Impl
                     ON_DELETION_EXPECTED,
                     this->on_deletion_.value ()));
       }
+    if (this->samples_read_.value () == 0)
+      {
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: read no samples\n")));
+      }
+    else
+      {
+        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: read <%u> samples\n"),
+                this->samples_read_.value ()));
+      }
 
     char ccm_buf [65];
     ACE_Thread_ID ccm_thread_id;
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h
index df1f04ce71c..74017d49a28 100644
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h
@@ -1,29 +1,6 @@
 // -*- C++ -*-
 // $Id$
 
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.cs.wustl.edu/~schmidt/TAO.html
- **/
 #ifndef CIAO_SL_ONEBYONE_RECEIVER_EXEC_TKIVXN_H_
 #define CIAO_SL_ONEBYONE_RECEIVER_EXEC_TKIVXN_H_
 
@@ -59,6 +36,7 @@ namespace CIAO_SL_OneByOne_Receiver_Impl
       Atomic_Long &,
       Atomic_Long &,
       Atomic_Long &,
+      Atomic_Long &,
       ACE_Thread_ID &);
     virtual ~info_out_data_listener_exec_i (void);
 
@@ -88,6 +66,7 @@ namespace CIAO_SL_OneByOne_Receiver_Impl
      Atomic_Long &on_creation_;
      Atomic_Long &on_one_update_;
      Atomic_Long &on_deletion_;
+     Atomic_Long &samples_read_;
      ACE_Thread_ID &thread_id_;
   };
 
@@ -183,6 +162,7 @@ namespace CIAO_SL_OneByOne_Receiver_Impl
     Atomic_Long on_creation_;
     Atomic_Long on_one_update_;
     Atomic_Long on_deletion_;
+    Atomic_Long samples_read_;
     ACE_Thread_ID thread_id_listener_;
     //@}
 
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp
index 28394253186..58b7c44e957 100644
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp
@@ -1,41 +1,15 @@
 // -*- C++ -*-
 // $Id$
 
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.cs.wustl.edu/~schmidt/TAO.html
- **/
-
 #include "SL_OneByOne_Sender_exec.h"
 #include "tao/ORB_Core.h"
 #include "ace/Reactor.h"
 
 namespace CIAO_SL_OneByOne_Sender_Impl
 {
-
   /**
    * Write action generator
    */
-
   pulse_Generator::pulse_Generator (Sender_exec_i &callback)
     : pulse_callback_ (callback)
   {
@@ -107,7 +81,6 @@ namespace CIAO_SL_OneByOne_Sender_Impl
   /**
    * Component Executor Implementation Class: Sender_exec_i
    */
-
   Sender_exec_i::Sender_exec_i (void)
     : test_nr_(UPDATE_CREATE),
       test_ok_(true)
@@ -312,7 +285,7 @@ namespace CIAO_SL_OneByOne_Sender_Impl
     catch (const CCM_DDS::InternalError& ex)
       {
         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                     ACE_TEXT ("whit update_many: index <%d> - retval <%d>\n"),
+                     ACE_TEXT ("with update_many: index <%d> - retval <%d>\n"),
                      ex.index, ex.error_code));
         return false;
       }
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.h
index 8098258b587..4b0cb743934 100644
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.h
@@ -1,29 +1,6 @@
 // -*- C++ -*-
 // $Id$
 
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.cs.wustl.edu/~schmidt/TAO.html
- **/
 #ifndef CIAO_SL_ONEBYONE_SENDER_EXEC_FHYBU2_H_
 #define CIAO_SL_ONEBYONE_SENDER_EXEC_FHYBU2_H_
 
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp
index 734c3955e33..7fde39d9f1f 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp
@@ -461,7 +461,7 @@ namespace CIAO_Updater_Sender_Impl
     catch (const CCM_DDS::InternalError& ex)
       {
         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                     ACE_TEXT ("whit update_many: index <%d> - retval <%d>\n"),
+                     ACE_TEXT ("with update_many: index <%d> - retval <%d>\n"),
                      ex.index, ex.error_code));
         return false;
       }