Thu Nov 26 10:19:55 UTC 2009 Marcel Smit <msmit@remedy.nl>

        * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp:
          Changed logging on exit. Reporting an error only when received < expected.

4 files changed, 25 insertions, 15 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 1712c79ea89..ba894f7170e 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,10 @@
+Thu Nov 26 10:19:55 UTC 2009  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp:
+          Changed logging on exit. Reporting an error only when received < expected.
+
 Thu Nov 26 09:28:25 UTC 2009  Marcel Smit  <msmit@remedy.nl>
 
         * examples/Hello/Receiver/Receiver.idl:
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp
index 3355cbaa924..07bd4877265 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp
@@ -264,17 +264,18 @@ namespace CIAO_Hello_Receiver_Impl
   void
   Receiver_exec_i::ccm_remove (void)
   {
-    CIAO_DEBUG ((LM_INFO, "Receiver_exec_i received %u messages and lost %u messages\n",
+    CIAO_DEBUG ((LM_INFO, "Receiver_exec_i summary: received <%u> - expected <%d> - lost <%u>\n",
                 this->received_.value (),
+                this->expected_,
                 this->lost_.value ()));
     if (this->lost_ > 0)
       {
-        CIAO_ERROR ((LM_ERROR, "ERROR : Lost %u messages\n",
+        CIAO_ERROR ((LM_ERROR, "ERROR : Lost %u samples\n",
             this->lost_.value ()));
       } 
-    if (this->received_ != this->expected_)
+    if (this->received_ < this->expected_)
       {
-        CIAO_ERROR ((LM_ERROR, "ERROR : Expected to receive %u messages, actually got %u\n",
+        CIAO_ERROR ((LM_ERROR, "ERROR : Expected to receive %u samples, actually got %u\n",
             this->expected_, this->received_.value ()));
       }
   }
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 a9a2834f7da..93b49979b50 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
@@ -409,13 +409,14 @@ namespace CIAO_Keyed_Test_Receiver_Impl
 
   void
   Receiver_exec_i::ccm_remove (void)
-  {
-    if (this->received_ != this->expected_)
+  {    
+    CIAO_DEBUG ((LM_INFO, "Receiver_exec_i summary: received <%u> - expected <%d>\n",
+                this->received_,
+                this->expected_));
+    if (this->received_ < this->expected_)
       {
-        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did not receive the expected")
-                               ACE_TEXT (" number of samples! Received <%d> ")
-                               ACE_TEXT ("Expected <%d>\n"),
-          this->received_.value (), this->expected_));
+        CIAO_ERROR ((LM_ERROR, "ERROR : Expected to receive %u samples, actually got %u\n",
+            this->expected_, this->received_));
       }
   }
 
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 3ade2e84548..36b18e1b0e9 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
@@ -186,12 +186,13 @@ namespace CIAO_Unkeyed_Test_Receiver_Impl
   void
   Receiver_exec_i::ccm_remove (void)
   {
-    if (this->received_ != this->iterations_)
+    CIAO_DEBUG ((LM_INFO, "Receiver_exec_i summary: received <%u> - expected <%d>\n",
+                this->received_,
+                this->expected_));
+    if (this->received_ < this->expected_)
       {
-        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did not receive the expected")
-                               ACE_TEXT (" number of samples! Received <%d> ")
-                               ACE_TEXT ("Expected <%d>\n"),
-          this->received_.value (), this->iterations_));
+        CIAO_ERROR ((LM_ERROR, "ERROR : Expected to receive %u samples, actually got %u\n",
+            this->expected_, this->received_));
       }
   }