ChangeLogTag:Tue

7 files changed, 39 insertions, 6 deletions

diff --git a/ACE/ACEXML/ChangeLog b/ACE/ACEXML/ChangeLog
index 28bf8bed510..1eb3dec01d8 100644
--- a/ACE/ACEXML/ChangeLog
+++ b/ACE/ACEXML/ChangeLog
@@ -1,3 +1,10 @@
+Tue Feb 28 03:03:38 UTC 2012  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * parser/parser/Parser.cpp (ACEXML_Parser::parse_reference_name):
+          Expression 'ch != '_' || ch != ':'' is always true. Used the
+          '&&' operator instead.  Thanks to Andrey Karpov <karpov at
+          viva64 dot com> for reporting this.
+
 Fri Oct 21 09:50:19 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * parser/parser/Parser.cpp:
diff --git a/ACE/ACEXML/parser/parser/Parser.cpp b/ACE/ACEXML/parser/parser/Parser.cpp
index fc6d4899e6e..3272898664d 100644
--- a/ACE/ACEXML/parser/parser/Parser.cpp
+++ b/ACE/ACEXML/parser/parser/Parser.cpp
@@ -1902,7 +1902,7 @@ ACEXML_Char*
 ACEXML_Parser::parse_reference_name (void)
 {
   ACEXML_Char ch = this->get ();
-  if (!this->isLetter (ch) && (ch != '_' || ch != ':'))
+  if (!this->isLetter (ch) && (ch != '_' && ch != ':'))
     return 0;
   while (ch) {
     this->alt_stack_.grow (ch);
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 155b9aba34f..35e42ff1cfb 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,29 @@
+Tue Feb 28 03:27:28 UTC 2012  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        *
+          apps/JAWS3/jaws3/Reactive_IO.cpp (JAWS_IO_Reactive_Transmit::handle_output_source):
+          Check mb == 0 before using it.  Thanks to Andrey Karpov <karpov
+          at viva64 dot com> for reporting this.
+
+Tue Feb 28 03:18:56 UTC 2012  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Throughput_Stats.cpp (ACE_Throughput_Stats::sample): Zapped
+          a redundant else statement.  Thanks to Andrey Karpov <karpov at
+          viva64 dot com> for reporting this.
+
+Tue Feb 28 03:15:37 UTC 2012  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * protocols/ace/INet/URLBase.cpp (ACE): Changed
+        
+          if (pos > 0 && url_string[pos+1] == '/' && url_string[pos+1] == '/')
+  
+          to
+  
+          if (pos > 0 && url_string[pos+1] == '/' && url_string[pos+2] == '/')
+          
+          Thanks to Andrey Karpov <karpov at viva64 dot com> for reporting
+          this.
+
 Mon Feb 27 08:11:06 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/Compression/rle/RLECompressor.h:
diff --git a/ACE/THANKS b/ACE/THANKS
index b2864cc96c2..7f8f53ea62f 100644
--- a/ACE/THANKS
+++ b/ACE/THANKS
@@ -2358,6 +2358,7 @@ Qiao Zhiqiang <qiaozhiqiang at leadcoretech dot com>
 JaeSung Lee <berise at gmail dot com>
 Chong Wuk Pak <chong dot pak at lmco dot com>
 Michael Frommberger <michael dot frommberger at gmx dot net>
+Andrey Karpov <karpov at viva64 dot com>
 
 I would particularly like to thank Paul Stephenson, who worked with me
 at Ericsson in the early 1990's.  Paul devised the recursive Makefile
diff --git a/ACE/ace/Throughput_Stats.cpp b/ACE/ace/Throughput_Stats.cpp
index 6df0abf6658..5f9aa6f6cb7 100644
--- a/ACE/ace/Throughput_Stats.cpp
+++ b/ACE/ace/Throughput_Stats.cpp
@@ -25,10 +25,6 @@ ACE_Throughput_Stats::sample (ACE_UINT64 throughput,
 
   if (this->samples_count () == 1u)
     {
-      this->throughput_last_   = throughput;
-    }
-  else
-    {
       this->throughput_last_ = throughput;
     }
 }
diff --git a/ACE/apps/JAWS3/jaws3/Reactive_IO.cpp b/ACE/apps/JAWS3/jaws3/Reactive_IO.cpp
index d2e16ff8b11..c8af2f39d01 100644
--- a/ACE/apps/JAWS3/jaws3/Reactive_IO.cpp
+++ b/ACE/apps/JAWS3/jaws3/Reactive_IO.cpp
@@ -414,6 +414,9 @@ JAWS_IO_Reactive_Transmit::handle_output_source (ACE_HANDLE handle)
 {
   ACE_Message_Block *mb = this->source_buf_;
 
+  if (mb == 0)
+    return -1;
+
   // Try to read data into the mb if data is still available.
   if (mb->space () && this->source_ != ACE_INVALID_HANDLE)
     {
diff --git a/ACE/protocols/ace/INet/URLBase.cpp b/ACE/protocols/ace/INet/URLBase.cpp
index 9ba4641ead3..5ce88ca4d1c 100644
--- a/ACE/protocols/ace/INet/URLBase.cpp
+++ b/ACE/protocols/ace/INet/URLBase.cpp
@@ -202,7 +202,7 @@ namespace ACE
         // may get a url passed without the actual prefix
 
         ACE_CString::size_type pos = url_string.find (':');
-        if (pos > 0 && url_string[pos+1] == '/' && url_string[pos+1] == '/')
+        if (pos > 0 && url_string[pos+1] == '/' && url_string[pos+2] == '/')
           {
             // in case we find a scheme check for the right protocol
             if (this->get_protocol () != url_string.substr (0, pos))