Create stream timeout timer before ondata() opeartions

zichangg · commit-bot@chromium.org · commit 53bda3946658 · 2019-07-22T16:23:58.000Z
Originally, Timer for timeout is created after controller.add() where onCancel has been triggered. Timeout events will always be called. Bug: #37565 Change-Id: I1504694cb746b6653d858effd7c5b33b07de6057 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/109725 Reviewed-by: Lasse R.H. Nielsen <lrn@google.com> Commit-Queue: Zichang Guo <zichangguo@google.com>
diff --git a/sdk/lib/async/stream.dart b/sdk/lib/async/stream.dart
@@ -1561,8 +1561,11 @@ abstract class Stream<T> {
 
     void onData(T event) {
       timer.cancel();
-      controller.add(event);
       timer = zone.createTimer(timeLimit, timeout);
+      // It might close the stream and cancel timer, so create recuring Timer
+      // before calling into add();
+      // issue: https://github.com/dart-lang/sdk/issues/37565
+      controller.add(event);
     }
 
     void onError(error, StackTrace stackTrace) {
