ChangeLogTag: Wed Nov 20 01:06:26 2002 Krishnakumar B <kitty@cs.wustl.edu>

3 files changed, 23 insertions, 12 deletions

diff --git a/ACEXML/ChangeLog b/ACEXML/ChangeLog
index 7853c3aee5a..debbb0c2767 100644
--- a/ACEXML/ChangeLog
+++ b/ACEXML/ChangeLog
@@ -1,3 +1,13 @@
+Wed Nov 20 01:06:26 2002  Krishnakumar B  <kitty@cs.wustl.edu>
+
+        * common/Mem_Map_Stream.cpp:
+
+          Minor indenting changes.
+
+        * tests/HttpCharStream_Test.cpp:
+
+          Modified test to show bug in ACE_File_Addr.
+
 Tue Nov 19 20:46:35 2002  Krishnakumar B  <kitty@cs.wustl.edu>
 
         * examples/SAXPrint/Print_Handler.cpp (warning):
diff --git a/ACEXML/common/Mem_Map_Stream.cpp b/ACEXML/common/Mem_Map_Stream.cpp
index cb96b21bc0c..2c6e4b9a874 100644
--- a/ACEXML/common/Mem_Map_Stream.cpp
+++ b/ACEXML/common/Mem_Map_Stream.cpp
@@ -35,15 +35,13 @@ ACEXML_Mem_Map_Stream::get_char (void)
 {
   if (this->eof () && this->grow_file_and_remap () == -1)
     return EOF;
-
   return *this->get_pos_++;
 }
 
 void
 ACEXML_Mem_Map_Stream::rewind (void)
 {
-  this->recv_pos_ = ACE_reinterpret_cast (char *,
-                          this->mem_map_.addr ());
+  this->recv_pos_ = ACE_reinterpret_cast (char *, this->mem_map_.addr ());
   this->get_pos_ = this->recv_pos_;
   this->end_of_mapping_plus1_ = this->recv_pos_ + this->mem_map_.size ();
 }
diff --git a/ACEXML/tests/HttpCharStream_Test.cpp b/ACEXML/tests/HttpCharStream_Test.cpp
index 982fbcd4e34..b30dc7fa55a 100644
--- a/ACEXML/tests/HttpCharStream_Test.cpp
+++ b/ACEXML/tests/HttpCharStream_Test.cpp
@@ -4,32 +4,35 @@
 
 int ACE_TMAIN (int, ACE_TCHAR *[])
 {
-  const ACEXML_Char* test = ACE_TEXT("http://www.cs.wustl.edu/~nanbor/");
+  const ACEXML_Char* test = ACE_TEXT("http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd");
 
-  const ACEXML_Char* simple = ACE_TEXT("http://www.cs.wustl.edu/~kitty/");
+  const ACEXML_Char* simple = ACE_TEXT("http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent");
 
-  ACEXML_HttpCharStream stream;
+  ACEXML_HttpCharStream first;
+  ACEXML_HttpCharStream second;
   ACEXML_Char ch;
 
-  if (stream.open (test) != -1)
+  if (first.open (test) != -1)
     {
-      while (stream.get (ch) != -1)
+      while (first.get (ch) != -1)
         ACE_OS::printf ("%c", ch);
-      stream.close();
     }
   else
     {
+      first.close();
       ACE_ERROR ((LM_ERROR, "Error in opening stream : %m\n"));
     }
-
-  if (stream.open (simple) != -1)
+  if (second.open (simple) != -1)
     {
-      while (stream.get (ch) != -1)
+      while (second.get (ch) != -1)
         ACE_OS::printf ("%c", ch);
     }
   else
     {
+      second.close();
       ACE_ERROR ((LM_ERROR, "Error in opening stream : %m\n"));
     }
+  first.close();
+  second.close();
   return 0;
 }