Index: pkg/barback/lib/src/utils.dart |
diff --git a/pkg/barback/lib/src/utils.dart b/pkg/barback/lib/src/utils.dart |
index 95f498e037a634f3c0aac681663b242b57be6882..3d54e87d2a395885c13720dd5b1941f8a4ee3855 100644 |
--- a/pkg/barback/lib/src/utils.dart |
+++ b/pkg/barback/lib/src/utils.dart |
@@ -139,9 +139,9 @@ Stream mergeStreams(Iterable<Stream> streams, {bool broadcast: false}) { |
for (var stream in streams) { |
stream.listen((value) { |
controller.add(value); |
- }, onError: (error) { |
- controller.addError(error); |
- }, onDone: () { |
+ }, |
Lasse Reichstein Nielsen
2013/10/04 08:45:17
just "controller.add", no need to eta-expand.
floitsch
2013/10/05 18:11:48
Done.
|
+ onError: controller.addError, |
Lasse Reichstein Nielsen
2013/10/04 08:45:17
Is indentation right here. I'd like it to be inden
floitsch
2013/10/05 18:11:48
Done.
|
+ onDone: () { |
doneCount++; |
if (doneCount == streams.length) controller.close(); |
}); |
@@ -188,10 +188,10 @@ Stream futureStream(Future<Stream> future) { |
future.then((stream) { |
stream.listen( |
controller.add, |
- onError: (error) => controller.addError(error), |
+ onError: controller.addError, |
onDone: controller.close); |
- }).catchError((e) { |
- controller.addError(e); |
+ }).catchError((e, StackTrace stackTrace) { |
+ controller.addError(e, stackTrace); |
controller.close(); |
}); |
return controller.stream; |