OLD | NEW |
1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file |
2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
4 | 4 |
5 library error_group; | 5 library error_group; |
6 | 6 |
7 import 'dart:async'; | 7 import 'dart:async'; |
8 | 8 |
9 import 'utils.dart'; | 9 import 'utils.dart'; |
10 | 10 |
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
233 /// [_controller]. | 233 /// [_controller]. |
234 StreamSubscription _subscription; | 234 StreamSubscription _subscription; |
235 | 235 |
236 /// Whether [this] has any listeners. | 236 /// Whether [this] has any listeners. |
237 bool get _hasListeners => _controller.hasListener; | 237 bool get _hasListeners => _controller.hasListener; |
238 | 238 |
239 /// Creates a new [_ErrorGroupFuture] that's a child of [_group] and wraps | 239 /// Creates a new [_ErrorGroupFuture] that's a child of [_group] and wraps |
240 /// [inner]. | 240 /// [inner]. |
241 _ErrorGroupStream(this._group, Stream inner) | 241 _ErrorGroupStream(this._group, Stream inner) |
242 : _controller = new StreamController() { | 242 : _controller = new StreamController() { |
243 this.stream = isBroadcast | 243 this._stream = inner.isBroadcast |
244 ? _controller.stream.asBroadcastStream() | 244 ? _controller.stream.asBroadcastStream() |
245 : _controller.stream; | 245 : _controller.stream; |
246 _subscription = inner.listen((v) { | 246 _subscription = inner.listen((v) { |
247 _controller.add(v); | 247 _controller.add(v); |
248 }, onError: (e) { | 248 }, onError: (e) { |
249 _group._signalError(e); | 249 _group._signalError(e); |
250 }, onDone: () { | 250 }, onDone: () { |
251 _isDone = true; | 251 _isDone = true; |
252 _group._signalStreamComplete(this); | 252 _group._signalStreamComplete(this); |
253 _controller.close(); | 253 _controller.close(); |
254 }); | 254 }); |
255 } | 255 } |
256 | 256 |
257 StreamSubscription listen(void onData(value), | 257 StreamSubscription listen(void onData(value), |
258 {void onError(var error), void onDone(), | 258 {void onError(var error), void onDone(), |
259 bool cancelOnError}) { | 259 bool cancelOnError}) { |
260 return _controller.stream.listen(onData, | 260 return _stream.listen(onData, |
261 onError: onError, | 261 onError: onError, |
262 onDone: onDone, | 262 onDone: onDone, |
263 cancelOnError: true); | 263 cancelOnError: true); |
264 } | 264 } |
265 | 265 |
266 /// Signal that an error from [_group] should be propagated through [this], | 266 /// Signal that an error from [_group] should be propagated through [this], |
267 /// unless it's already complete. | 267 /// unless it's already complete. |
268 void _signalError(var e) { | 268 void _signalError(var e) { |
269 if (_isDone) return; | 269 if (_isDone) return; |
270 _subscription.cancel(); | 270 _subscription.cancel(); |
271 // Call these asynchronously to work around issue 7913. | 271 // Call these asynchronously to work around issue 7913. |
272 new Future.immediate(null).then((_) { | 272 new Future.immediate(null).then((_) { |
273 _controller.addError(e); | 273 _controller.addError(e); |
274 _controller.close(); | 274 _controller.close(); |
275 }); | 275 }); |
276 } | 276 } |
277 } | 277 } |
OLD | NEW |