Author: gonzalo
Date: 2007-01-25 01:12:54 -0500 (Thu, 25 Jan 2007)
New Revision: 71650

Modified:
   trunk/mcs/class/corlib/System.IO/ChangeLog
   trunk/mcs/class/corlib/System.IO/StreamReader.cs
Log:
2007-01-24 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>

        * StreamReader.cs: fix for bug #75526. We return earlier from Read () if
        the underlying stream might block or end on the next read.



Modified: trunk/mcs/class/corlib/System.IO/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/System.IO/ChangeLog  2007-01-25 06:01:37 UTC (rev 
71649)
+++ trunk/mcs/class/corlib/System.IO/ChangeLog  2007-01-25 06:12:54 UTC (rev 
71650)
@@ -1,3 +1,8 @@
+2007-01-24 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
+
+       * StreamReader.cs: fix for bug #75526. We return earlier from Read () if
+       the underlying stream might block or end on the next read.
+
 2007-01-22  Miguel de Icaza  <[EMAIL PROTECTED]>
 
        * DirectoryInfo.cs: Throw a better exception (accorind go the

Modified: trunk/mcs/class/corlib/System.IO/StreamReader.cs
===================================================================
--- trunk/mcs/class/corlib/System.IO/StreamReader.cs    2007-01-25 06:01:37 UTC 
(rev 71649)
+++ trunk/mcs/class/corlib/System.IO/StreamReader.cs    2007-01-25 06:12:54 UTC 
(rev 71650)
@@ -375,6 +375,8 @@
                                index += cch;
                                count -= cch;
                                chars_read += cch;
+                               if (mayBlock)
+                                       break;
                        }
                        return chars_read;
                }

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to