ChangeLogTag:Mon Mar 5 08:20:21 2001 Carlos O'Ryan <coryan@uci.edu>

5 files changed, 71 insertions, 53 deletions

diff --git a/ChangeLog b/ChangeLog
index f6b373114ee..e608a4be940 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,25 +1,31 @@
+Mon Mar  5 08:20:21 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tests/RMCast/RMCast_Fragment_Test.cpp:
+        * tests/RMCast/RMCast_Reassembly_Test.cpp:
+          Undo Doug's changes.  They broke the test.
+
 Mon Mar  5 07:52:52 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-	* tests/RMCast/RMCast_Fragment_Test.cpp,
-	* tests/RMCast/RMCast_Reassembly_Test.cpp,
-	* tests/Dynamic_Priority_Test.cpp,
-	* tests/Thread_Pool_Test.cpp: Make sure to write into the
-	  wr_ptr() rather than the rd_ptr().  Thanks to Gonzalo Diethelm
- 	  <Gonzalo.Diethelm@sonda.com> for reporting this.
+        * tests/RMCast/RMCast_Fragment_Test.cpp,
+        * tests/RMCast/RMCast_Reassembly_Test.cpp,
+        * tests/Dynamic_Priority_Test.cpp,
+        * tests/Thread_Pool_Test.cpp: Make sure to write into the
+          wr_ptr() rather than the rd_ptr().  Thanks to Gonzalo Diethelm
+          <Gonzalo.Diethelm@sonda.com> for reporting this.
 
 Mon Mar  5 08:00:23 2001  Chad Elliott  <elliott_c@ociweb.com>
 
-        * bin/nightlybuilds/builds.lst: 
+        * bin/nightlybuilds/builds.lst:
 
           Added new VxWorks 5.4 and Chorus 4.0.1 nightly builds.
 
 Mon Mar 05 00:10:15 2001  Ossama Othman  <ossama@uci.edu>
 
-	* bin/fuzz.pl:
+        * bin/fuzz.pl:
 
-	  Updated to detect missing ACE_TRY_ENV parameters in
-	  ORB::resolve_initial_references() calls when emulated exceptions
-	  are used.  Thanks to Darrell for providing this update.
+          Updated to detect missing ACE_TRY_ENV parameters in
+          ORB::resolve_initial_references() calls when emulated exceptions
+          are used.  Thanks to Darrell for providing this update.
 
 Mon Mar  5 07:57:07 2001  Johnny Willemsen <jwillemsen@remedy.nl>
 
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index f6b373114ee..e608a4be940 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,25 +1,31 @@
+Mon Mar  5 08:20:21 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tests/RMCast/RMCast_Fragment_Test.cpp:
+        * tests/RMCast/RMCast_Reassembly_Test.cpp:
+          Undo Doug's changes.  They broke the test.
+
 Mon Mar  5 07:52:52 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-	* tests/RMCast/RMCast_Fragment_Test.cpp,
-	* tests/RMCast/RMCast_Reassembly_Test.cpp,
-	* tests/Dynamic_Priority_Test.cpp,
-	* tests/Thread_Pool_Test.cpp: Make sure to write into the
-	  wr_ptr() rather than the rd_ptr().  Thanks to Gonzalo Diethelm
- 	  <Gonzalo.Diethelm@sonda.com> for reporting this.
+        * tests/RMCast/RMCast_Fragment_Test.cpp,
+        * tests/RMCast/RMCast_Reassembly_Test.cpp,
+        * tests/Dynamic_Priority_Test.cpp,
+        * tests/Thread_Pool_Test.cpp: Make sure to write into the
+          wr_ptr() rather than the rd_ptr().  Thanks to Gonzalo Diethelm
+          <Gonzalo.Diethelm@sonda.com> for reporting this.
 
 Mon Mar  5 08:00:23 2001  Chad Elliott  <elliott_c@ociweb.com>
 
-        * bin/nightlybuilds/builds.lst: 
+        * bin/nightlybuilds/builds.lst:
 
           Added new VxWorks 5.4 and Chorus 4.0.1 nightly builds.
 
 Mon Mar 05 00:10:15 2001  Ossama Othman  <ossama@uci.edu>
 
-	* bin/fuzz.pl:
+        * bin/fuzz.pl:
 
-	  Updated to detect missing ACE_TRY_ENV parameters in
-	  ORB::resolve_initial_references() calls when emulated exceptions
-	  are used.  Thanks to Darrell for providing this update.
+          Updated to detect missing ACE_TRY_ENV parameters in
+          ORB::resolve_initial_references() calls when emulated exceptions
+          are used.  Thanks to Darrell for providing this update.
 
 Mon Mar  5 07:57:07 2001  Johnny Willemsen <jwillemsen@remedy.nl>
 
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index f6b373114ee..e608a4be940 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,25 +1,31 @@
+Mon Mar  5 08:20:21 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tests/RMCast/RMCast_Fragment_Test.cpp:
+        * tests/RMCast/RMCast_Reassembly_Test.cpp:
+          Undo Doug's changes.  They broke the test.
+
 Mon Mar  5 07:52:52 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-	* tests/RMCast/RMCast_Fragment_Test.cpp,
-	* tests/RMCast/RMCast_Reassembly_Test.cpp,
-	* tests/Dynamic_Priority_Test.cpp,
-	* tests/Thread_Pool_Test.cpp: Make sure to write into the
-	  wr_ptr() rather than the rd_ptr().  Thanks to Gonzalo Diethelm
- 	  <Gonzalo.Diethelm@sonda.com> for reporting this.
+        * tests/RMCast/RMCast_Fragment_Test.cpp,
+        * tests/RMCast/RMCast_Reassembly_Test.cpp,
+        * tests/Dynamic_Priority_Test.cpp,
+        * tests/Thread_Pool_Test.cpp: Make sure to write into the
+          wr_ptr() rather than the rd_ptr().  Thanks to Gonzalo Diethelm
+          <Gonzalo.Diethelm@sonda.com> for reporting this.
 
 Mon Mar  5 08:00:23 2001  Chad Elliott  <elliott_c@ociweb.com>
 
-        * bin/nightlybuilds/builds.lst: 
+        * bin/nightlybuilds/builds.lst:
 
           Added new VxWorks 5.4 and Chorus 4.0.1 nightly builds.
 
 Mon Mar 05 00:10:15 2001  Ossama Othman  <ossama@uci.edu>
 
-	* bin/fuzz.pl:
+        * bin/fuzz.pl:
 
-	  Updated to detect missing ACE_TRY_ENV parameters in
-	  ORB::resolve_initial_references() calls when emulated exceptions
-	  are used.  Thanks to Darrell for providing this update.
+          Updated to detect missing ACE_TRY_ENV parameters in
+          ORB::resolve_initial_references() calls when emulated exceptions
+          are used.  Thanks to Darrell for providing this update.
 
 Mon Mar  5 07:57:07 2001  Johnny Willemsen <jwillemsen@remedy.nl>
 
diff --git a/tests/RMCast/RMCast_Fragment_Test.cpp b/tests/RMCast/RMCast_Fragment_Test.cpp
index 390fc626dc0..e180ff20908 100644
--- a/tests/RMCast/RMCast_Fragment_Test.cpp
+++ b/tests/RMCast/RMCast_Fragment_Test.cpp
@@ -205,7 +205,9 @@ ACE_RMCast_Fragment_Tester::initialize (ACE_Message_Block *mb)
     {
       char z = 0;
       for (char *j = i->rd_ptr (); j != i->wr_ptr (); ++j)
-        *j = ++z;
+        {
+          *j = ++z;
+        }
     }
 }
 
@@ -217,10 +219,10 @@ ACE_RMCast_Fragment_Tester::compare (ACE_Message_Block *mb)
 
   for (const ACE_Message_Block *i = mb; i != 0; i = i->cont ())
     {
-      blob.copy (i->wr_ptr (), i->length ());
+      blob.copy (i->rd_ptr (), i->length ());
     }
 
-  if (ACE_OS::memcmp (blob.wr_ptr (),
+  if (ACE_OS::memcmp (blob.rd_ptr (),
                       this->received_.rd_ptr (),
                       n) != 0)
     {
@@ -273,7 +275,7 @@ ACE_RMCast_Fragment_Tester::data (ACE_RMCast::Data &data)
   size_t fragment_size = payload_size;
   if (payload_size > 0)
     {
-      ACE_OS::memcpy (this->received_.wr_ptr () + offset,
+      ACE_OS::memcpy (this->received_.rd_ptr () + offset,
                       mb->rd_ptr (),
                       payload_size);
       this->received_bytes_ += payload_size;
@@ -286,9 +288,8 @@ ACE_RMCast_Fragment_Tester::data (ACE_RMCast::Data &data)
       // ACE_DEBUG ((LM_DEBUG,
       //         "offset = %d , payload = %d\n", offset, payload_size));
       fragment_size += payload_size;
-      ACE_OS::memcpy (this->received_.wr_ptr () + offset,
-                      i->rd_ptr (),
-                      payload_size);
+      ACE_OS::memcpy (this->received_.rd_ptr () + offset,
+                      i->rd_ptr (), payload_size);
       this->received_bytes_ += payload_size;
       offset += payload_size;
     }
diff --git a/tests/RMCast/RMCast_Reassembly_Test.cpp b/tests/RMCast/RMCast_Reassembly_Test.cpp
index 27f2aff7fa0..dba5bffa34a 100644
--- a/tests/RMCast/RMCast_Reassembly_Test.cpp
+++ b/tests/RMCast/RMCast_Reassembly_Test.cpp
@@ -101,7 +101,7 @@ ACE_RMCast_Reassembly_Tester::svc (void)
 
         // Use an ACT to store the results in <received>
         ACE_Message_Block *received_pointer = &received;
-        ACE_OS::memcpy (big_blob.wr_ptr (),
+        ACE_OS::memcpy (big_blob.rd_ptr (),
                         &received_pointer,
                         sizeof(received_pointer));
 
@@ -142,7 +142,7 @@ ACE_RMCast_Reassembly_Tester::svc (void)
 
         // Use an ACT to store the results in <received>
         ACE_Message_Block *received_pointer = &received;
-        ACE_OS::memcpy (big_blob.wr_ptr (),
+        ACE_OS::memcpy (big_blob.rd_ptr (),
                         &received_pointer,
                         sizeof(received_pointer));
 
@@ -200,9 +200,10 @@ ACE_RMCast_Reassembly_Tester::initialize (ACE_Message_Block *mb)
   for (ACE_Message_Block *i = mb; i != 0; i = i->cont ())
     {
       char z = 0;
-
       for (char *j = i->rd_ptr (); j != i->wr_ptr (); ++j)
-        *j = ++z;
+        {
+          *j = ++z;
+        }
     }
 }
 
@@ -214,14 +215,14 @@ ACE_RMCast_Reassembly_Tester::compare (ACE_Message_Block *received,
   ACE_Message_Block blob (n);
 
   for (const ACE_Message_Block *i = original; i != 0; i = i->cont ())
-    blob.copy (i->wr_ptr (), i->length ());
+    {
+      blob.copy (i->rd_ptr (), i->length ());
+    }
 
   if (received->rd_ptr () == 0)
-    ACE_ERROR_RETURN ((LM_DEBUG, 
-                       ACE_TEXT ("INCOMPLETE MESSAGE\n")),
-                      -1);
+    ACE_ERROR_RETURN ((LM_DEBUG, ACE_TEXT ("INCOMPLETE MESSAGE\n")), -1);
 
-  if (ACE_OS::memcmp (blob.wr_ptr (),
+  if (ACE_OS::memcmp (blob.rd_ptr (),
                       received->rd_ptr (),
                       n) != 0)
     {
@@ -256,14 +257,12 @@ ACE_RMCast_Reassembly_Tester::data (ACE_RMCast::Data &data)
   ACE_Message_Block *mb = data.payload;
 
   ACE_Message_Block *pointer;
-  ACE_OS::memcpy (&pointer,
-                  mb->wr_ptr (),
-                  sizeof (pointer));
+  ACE_OS::memcpy (&pointer, mb->rd_ptr (), sizeof(pointer));
 
   size_t l = mb->length ();
   pointer->size (l);
   pointer->wr_ptr (pointer->rd_ptr () + l);
-  ACE_OS::memcpy (pointer->wr_ptr (), mb->rd_ptr (), l);
+  ACE_OS::memcpy (pointer->rd_ptr (), mb->rd_ptr (), l);
   return 0;
 }