jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes #8994. FutureStream read procedure data loss no longer occurs. (#9183)

Browse source 
* Fixes #8994. FutureStream read procedure data loss no longer occurs.

* Optimises the fix for #8994.
This commit is contained in:
Dominik Picheta 2018-10-09 18:39:12 +01:00 • committed by Andreas Rumpf
commit 21ecf64d24
2 changed files with 24 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/pure/asyncstreams.nim
View file

@ -81,6 +81,9 @@ proc read*[T](future: FutureStream[T]): Future[(bool, T)] =
let savedCb = future.cb
future.callback =
proc (fs: FutureStream[T]) =
# Exit early if `resFut` is already complete. (See #8994).
if resFut.finished: return
# We don't want this callback called again.
future.cb = nil
@ -93,8 +96,7 @@ proc read*[T](future: FutureStream[T]): Future[(bool, T)] =
res[0] = true
res[1] = fs.queue.popFirst()
if not resFut.finished:
resFut.complete(res)
resFut.complete(res)
# If the saved callback isn't nil then let's call it.
if not savedCb.isNil: savedCb()