[Test] Avoid MethodInfoTest.GetMethodBody failure when executed on a release (IL...

[mono.git] / mcs / class / corlib / System.IO / Stream.cs

diff --git a/mcs/class/corlib/System.IO/Stream.cs b/mcs/class/corlib/System.IO/Stream.cs
index c886724454f9fa9bcc0d1796550cdefbcb495411..17119e612bea968cb5881223f93d3386f3bd22f2 100644 (file)
--- a/mcs/class/corlib/System.IO/Stream.cs
+++ b/mcs/class/corlib/System.IO/Stream.cs
@@ -153,7 +153,7 @@ namespace System.IO
                {
                        byte[] buffer = new byte [1];
 
-                       if (Read (buffer, 0, 1) == 1)
+                       if (Read (buffer, 0, 1) > 0)
                                return buffer [0];
                        
                        return -1;
@@ -240,7 +240,7 @@ namespace System.IO
                        }
                }
 
-#if NET_4_0 || MOBILE
+#if NET_4_0
                public void CopyTo (Stream destination)
                {
                        CopyTo (destination, 16*1024);
@@ -303,7 +303,7 @@ namespace System.IO
                async Task CopyToAsync (Stream destination, byte[] buffer, CancellationToken cancellationToken)
                {
                        int nread;
-                       while ((nread = await ReadAsync (buffer, 0, buffer.Length).ConfigureAwait (false)) != 0)
+                       while ((nread = await ReadAsync (buffer, 0, buffer.Length, cancellationToken).ConfigureAwait (false)) != 0)
                                await destination.WriteAsync (buffer, 0, nread, cancellationToken).ConfigureAwait (false);
                }