Merge pull request #173 from AArnott/fix170

Consistently complete with OCE on cancellation

Author: AArnott

src/Nerdbank.Streams/PipeExtensions.cs

@@ -111,8 +111,9 @@ public static PipeWriter UsePipeWriter(this Stream stream, PipeOptions? pipeOpti
             {
                 try
                 {
-                    while (!cancellationToken.IsCancellationRequested)
+                    while (true)
                     {
+                        cancellationToken.ThrowIfCancellationRequested();
                         ReadResult readResult = await pipe.Reader.ReadAsync(cancellationToken).ConfigureAwait(false);
                         if (readResult.Buffer.Length > 0)
                         {
@@ -233,11 +234,12 @@ public static PipeReader UsePipeReader(this WebSocket webSocket, int sizeHint =
             var pipe = new Pipe(pipeOptions ?? PipeOptions.Default);
             Task.Run(async delegate
             {
-                while (!cancellationToken.IsCancellationRequested)
+                while (true)
                 {
                     Memory<byte> memory = pipe.Writer.GetMemory(sizeHint);
                     try
                     {
+                        cancellationToken.ThrowIfCancellationRequested();
                         var readResult = await webSocket.ReceiveAsync(memory, cancellationToken).ConfigureAwait(false);
                         if (readResult.Count == 0)
                         {
@@ -283,8 +285,9 @@ public static PipeWriter UsePipeWriter(this WebSocket webSocket, PipeOptions? pi
             {
                 try
                 {
-                    while (!cancellationToken.IsCancellationRequested)
+                    while (true)
                     {
+                        cancellationToken.ThrowIfCancellationRequested();
                         ReadResult readResult = await pipe.Reader.ReadAsync(cancellationToken).ConfigureAwait(false);
                         if (readResult.Buffer.Length > 0)
                         {
@@ -389,8 +392,9 @@ internal static Task LinkToAsync(this PipeReader reader, PipeWriter writer, bool
             {
                 try
                 {
-                    while (!cancellationToken.IsCancellationRequested)
+                    while (true)
                     {
+                        cancellationToken.ThrowIfCancellationRequested();
                         var result = await reader.ReadAsync(cancellationToken).ConfigureAwait(false);
                         writer.Write(result.Buffer);
                         reader.AdvanceTo(result.Buffer.End);