Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1035)

Unified Diff: sdk/lib/io/secure_socket.dart

Issue 25094002: Adapt streams for additional stackTrace argument. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Address comments. Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: sdk/lib/io/secure_socket.dart
diff --git a/sdk/lib/io/secure_socket.dart b/sdk/lib/io/secure_socket.dart
index ef686fdb572ec597becb15acb9d4f0ea8b6dfd64..8ad69d370c7136cb962cea6b6d1d175bb1a5d114 100644
--- a/sdk/lib/io/secure_socket.dart
+++ b/sdk/lib/io/secure_socket.dart
@@ -554,7 +554,7 @@ class _RawSecureSocket extends Stream<RawSocketEvent>
}
StreamSubscription listen(void onData(RawSocketEvent data),
- {void onError(error),
+ {Function onError,
void onDone(),
bool cancelOnError}) {
_sendWriteEvent();
@@ -748,8 +748,8 @@ class _RawSecureSocket extends Stream<RawSocketEvent>
} else if (event == RawSocketEvent.READ_CLOSED) {
_closeHandler();
}
- } catch (e) {
- _reportError(e);
+ } catch (e, stackTrace) {
+ _reportError(e, stackTrace);
}
}
@@ -769,16 +769,16 @@ class _RawSecureSocket extends Stream<RawSocketEvent>
}
}
- void _reportError(e) {
+ void _reportError(e, [StackTrace stackTrace]) {
if (_status == CLOSED) {
return;
} else if (_connectPending) {
// _connectPending is true until the handshake has completed, and the
// _handshakeComplete future returned from SecureSocket.connect has
// completed. Before this point, we must complete it with an error.
- _handshakeComplete.completeError(e);
+ _handshakeComplete.completeError(e, stackTrace);
} else {
- _controller.addError(e);
+ _controller.addError(e, stackTrace);
}
_close();
}
@@ -800,7 +800,8 @@ class _RawSecureSocket extends Stream<RawSocketEvent>
_socketClosedRead = true;
if (_filterStatus.readEmpty) {
_reportError(
- new HandshakeException('Connection terminated during handshake'));
+ new HandshakeException('Connection terminated during handshake'),
+ null);
} else {
_secureHandshake();
}
@@ -814,8 +815,8 @@ class _RawSecureSocket extends Stream<RawSocketEvent>
_readSocket();
_writeSocket();
_scheduleFilter();
- } catch (e) {
- _reportError(e);
+ } catch (e, stackTrace) {
+ _reportError(e, stackTrace);
}
}
@@ -999,7 +1000,8 @@ class _RawSecureSocket extends Stream<RawSocketEvent>
return _IOService.dispatch(_SSL_PROCESS_FILTER, args).then((response) {
if (response.length == 2) {
- _reportError(new TlsException('${response[1]} error ${response[0]}'));
+ _reportError(new TlsException('${response[1]} error ${response[0]}'),
+ null);
}
int start(int index) => response[2 * index];
int end(int index) => response[2 * index + 1];

Powered by Google App Engine
This is Rietveld 408576698