Allow reading CoapBlockStream if data is still buffered.

NZSmartie · Jan 1, 2018 · 7954c95 · 7954c95
1 parent a139707
commit 7954c95
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/CoAPNet/CoapBlockStream.cs b/src/CoAPNet/CoapBlockStream.cs
@@ -83,7 +83,7 @@ public int BlockSize
         }
 
         /// <inheritdoc/>
-        public override bool CanRead => !_endOfStream && (_readerTask?.IsCompleted ?? false);
+        public override bool CanRead => !_endOfStream || _reader.Length > 0;
 
         /// <inheritdoc/>
         public override bool CanSeek => false;
@@ -302,9 +302,14 @@ public override async Task<int> ReadAsync(byte[] buffer, int offset, int count,
             var read = 0;
             while (read < count && !cancellationToken.IsCancellationRequested)
             {
-                await _readerEvent.WaitAsync(cancellationToken);
+                if (!_endOfStream)
+                    await _readerEvent.WaitAsync(cancellationToken);
 
-                read += _reader.Dequeue(buffer, offset + read, count - read);
+                var bytesDequeued = _reader.Dequeue(buffer, offset + read, count - read);
+                read += bytesDequeued;
+
+                if (bytesDequeued == 0 && _endOfStream)
+                    break;
             }
 
             return read;