Index: sdk/lib/io/secure_server_socket.dart |
diff --git a/sdk/lib/io/secure_server_socket.dart b/sdk/lib/io/secure_server_socket.dart |
index c987a487cba1bbc13189b1288c8f251bd7a9acad..c3ce9cfb49f881e8893bceb7352968c961441192 100644 |
--- a/sdk/lib/io/secure_server_socket.dart |
+++ b/sdk/lib/io/secure_server_socket.dart |
@@ -275,21 +275,13 @@ class RawSecureServerSocket extends Stream<RawSecureSocket> { |
} else { |
_controller.add(secureConnection); |
} |
- }).catchError((e) { |
+ }).catchError((e, s) { |
if (!_closed) { |
- _controller.addError(e); |
+ _controller.addError(e, s); |
} |
}); |
} |
- void _onError(e, [StackTrace stackTrace]) { |
- _controller.addError(e, stackTrace); |
- } |
- |
- void _onDone() { |
- _controller.close(); |
- } |
- |
void _onPauseStateChange() { |
if (_controller.isPaused) { |
_subscription.pause(); |
@@ -301,14 +293,16 @@ class RawSecureServerSocket extends Stream<RawSecureSocket> { |
void _onSubscriptionStateChange() { |
if (_controller.hasListener) { |
_subscription = _socket.listen(_onData, |
- onDone: _onDone, |
- onError: _onError); |
+ onError: _controller.addError, |
+ onDone: _controller.close); |
} else { |
close(); |
} |
} |
- void set _owner(owner) { (_socket as dynamic)._owner = owner; } |
+ void set _owner(owner) { |
+ (_socket as dynamic)._owner = owner; |
+ } |
} |